On 05/07/2014 11:37 AM, Luis Henriques wrote: > On Tue, May 06, 2014 at 02:05:09PM +0200, Jiri Slaby wrote: >> From: Axel Lin <[email protected]> >> >> This patch has been added to the 3.12 stable tree. If you have any >> objections, please let us know. >> > > This patch doesn't seem to be applicable to the 3.12 kernel as it > doesn't contain commit 43f627ac9de42 ("spi: dw: fix memory leak on > error path") which introduced the devm_kzalloc() call.
Hi, now dropped from 3.12. Thanks. >> >> commit c63f5da00845143de621e991ea186be0829647ee upstream. >> >> With devm_kzalloc, the memory is automatically freed when spi_device detach >> from >> the bus. >> >> Fixes: commit 43f627ac9de42 (spi: dw: fix memory leak on error path) >> Signed-off-by: Axel Lin <[email protected]> >> Acked-by: Baruch Siach <[email protected]> >> Signed-off-by: Mark Brown <[email protected]> >> Signed-off-by: Jiri Slaby <[email protected]> >> --- >> drivers/spi/spi-dw.c | 7 ------- >> 1 file changed, 7 deletions(-) >> >> diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c >> index 79c958e49f61..3bc156472960 100644 >> --- a/drivers/spi/spi-dw.c >> +++ b/drivers/spi/spi-dw.c >> @@ -671,12 +671,6 @@ static int dw_spi_setup(struct spi_device *spi) >> return 0; >> } >> >> -static void dw_spi_cleanup(struct spi_device *spi) >> -{ >> - struct chip_data *chip = spi_get_ctldata(spi); >> - kfree(chip); >> -} >> - >> static int init_queue(struct dw_spi *dws) >> { >> INIT_LIST_HEAD(&dws->queue); >> @@ -808,7 +802,6 @@ int dw_spi_add_host(struct dw_spi *dws) >> master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(16); >> master->bus_num = dws->bus_num; >> master->num_chipselect = dws->num_cs; >> - master->cleanup = dw_spi_cleanup; >> master->setup = dw_spi_setup; >> master->transfer = dw_spi_transfer; >> >> -- >> 1.9.2 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe stable" in >> the body of a message to [email protected] >> More majordomo info at http://vger.kernel.org/majordomo-info.html -- js suse labs -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
