aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-09-09 22:19:29 -0400
committerMark Brown <broonie@linaro.org>2013-09-10 06:28:22 -0400
commit9b4003a687abcf2fe25ba9073dd07345e4529183 (patch)
tree15c3c27e6f723dbb713acb535e79b6c24c16e609
parent578739259875a93b1869d25cdf4a8bd963b7d0a7 (diff)
spi: clps711x: Don't call kfree() after spi_master_put/spi_unregister_master
Calling kfree() to clean up the memory obtained from spi_alloc_master() is wrong as this is done in spi_master_release() when spi_master->dev's refcount reaches zero. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/spi/spi-clps711x.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 5655acf55bfe..b597a92565dc 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -247,7 +247,6 @@ err_out:
247 gpio_free(hw->chipselect[i]); 247 gpio_free(hw->chipselect[i]);
248 248
249 spi_master_put(master); 249 spi_master_put(master);
250 kfree(master);
251 250
252 return ret; 251 return ret;
253} 252}
@@ -263,7 +262,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
263 gpio_free(hw->chipselect[i]); 262 gpio_free(hw->chipselect[i]);
264 263
265 spi_unregister_master(master); 264 spi_unregister_master(master);
266 kfree(master);
267 265
268 return 0; 266 return 0;
269} 267}