diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-26 11:40:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-26 11:40:56 +0100 |
| 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 5655acf55bf..b597a92565d 100644 --- a/drivers/spi/spi-clps711x.c +++ b/drivers/spi/spi-clps711x.c @@ -247,7 +247,6 @@ err_out: 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; } |