| commit | 13e92b5b1e8380997029d63fc7c85cdf18bdcf2b | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Thu Sep 26 11:40:56 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Thu Sep 26 11:40:56 2013 +0100 |
| tree | 34ea948f91d73346f6d8b3e593db23109eb5e530 | |
| parent | 666d5b4c742ba666eb68b467d777b7862f362ae5 [diff] | |
| parent | 9b4003a687abcf2fe25ba9073dd07345e4529183 [diff] |
Merge remote-tracking branch 'spi/fix/clps711x' into spi-devm
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c index 5655acf..b597a92 100644 --- a/drivers/spi/spi-clps711x.c +++ b/drivers/spi/spi-clps711x.c
@@ -247,7 +247,6 @@ gpio_free(hw->chipselect[i]); spi_master_put(master); - kfree(master); return ret; } @@ -263,7 +262,6 @@ gpio_free(hw->chipselect[i]); spi_unregister_master(master); - kfree(master); return 0; }