Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x

Conflicts:
	drivers/spi/spi-clps711x.c

diff --combined drivers/spi/spi-clps711x.c
index 1a786834c16dc6e481a0fded9900af61b84eac6a,6416798828e72bc9f5194282f55cf49a37f6809c..73b9a461853ffea12a3d34ad8b758a9a8804de1c
--- 1/drivers/spi/spi-clps711x.c
--- 2/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@@ -226,8 -226,7 +226,7 @@@ static int spi_clps711x_probe(struct pl
                               dev_name(&pdev->dev), hw);
        if (ret) {
                dev_err(&pdev->dev, "Can't request IRQ\n");
-               clk_put(hw->spi_clk);
 -              goto clk_out;
 +              goto err_out;
        }
  
        ret = spi_register_master(master);
@@@ -240,13 -239,13 +239,12 @@@
  
        dev_err(&pdev->dev, "Failed to register master\n");
  
 -clk_out:
  err_out:
        while (--i >= 0)
                if (gpio_is_valid(hw->chipselect[i]))
                        gpio_free(hw->chipselect[i]);
  
        spi_master_put(master);
-       kfree(master);
  
        return ret;
  }
@@@ -262,7 -261,6 +260,6 @@@ static int spi_clps711x_remove(struct p
                        gpio_free(hw->chipselect[i]);
  
        spi_unregister_master(master);
-       kfree(master);
  
        return 0;
  }