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

[karo-tx-linux.git] / drivers / spi / spi-clps711x.c

diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 5655acf55bfe35a7d4f0fcb853e56435b4e847c9..73b9a461853ffea12a3d34ad8b758a9a8804de1c 100644 (file)
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -226,8 +226,7 @@ static int spi_clps711x_probe(struct platform_device *pdev)
                               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,14 +239,12 @@ static int spi_clps711x_probe(struct platform_device *pdev)
 
        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;
 }
@@ -263,7 +260,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
                        gpio_free(hw->chipselect[i]);
 
        spi_unregister_master(master);
-       kfree(master);
 
        return 0;
 }