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

Conflicts: drivers/spi/spi-clps711x.c

Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x
Conflicts: drivers/spi/spi-clps711x.c
2b2322d6 · Mark Brown · c7083790 · 0158026c · 2b2322d6
Commit 2b2322d6 authored Oct 03, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

drivers/spi/spi-clps711x.c drivers/spi/spi-clps711x.c +0 -3

No files found.
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -226,7 +226,6 @@ 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 err_out;
 	}
@@ -246,7 +245,6 @@ static int spi_clps711x_probe(struct platform_device *pdev)
 			gpio_free(hw->chipselect[i]);
 	spi_master_put(master);
-	kfree(master);
 	return ret;
 }
@@ -262,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;
 }