diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-26 06:40:56 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-26 06:40:56 -0400 |
commit | 13e92b5b1e8380997029d63fc7c85cdf18bdcf2b (patch) | |
tree | 34ea948f91d73346f6d8b3e593db23109eb5e530 | |
parent | 666d5b4c742ba666eb68b467d777b7862f362ae5 (diff) | |
parent | 9b4003a687abcf2fe25ba9073dd07345e4529183 (diff) |
Merge remote-tracking branch 'spi/fix/clps711x' into spi-devm
-rw-r--r-- | drivers/spi/spi-clps711x.c | 2 |
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 | } |