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

git-mirror · Sep 26, 2013 · 13e92b5 · 13e92b5
2 parents 666d5b4 + 9b4003a
commit 13e92b5
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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;
 }