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

Conflicts:
	drivers/spi/spi-clps711x.c

diff --cc drivers/spi/spi-clps711x.c
index 1a78683,6416798..73b9a46
--- 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);