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

13e92b5b · Mark Brown · 666d5b4c · 9b4003a6 · 13e92b5b
Commit 13e92b5b authored Sep 26, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

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

No files found.
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -247,7 +247,6 @@ static int spi_clps711x_probe(struct platform_device *pdev)
 			gpio_free(hw->chipselect[i]);

 	spi_master_put(master);
-	kfree(master);

 	return ret;
 }
@@ -263,7 +262,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
 			gpio_free(hw->chipselect[i]);

 	spi_unregister_master(master);
-	kfree(master);

 	return 0;
 }