summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2013-12-30 20:30:46 +0200
committerMark Brown <broonie@linaro.org>2013-12-31 12:30:25 +0000
commit43f627ac9de42607b2cdcc7a41f2bcc82187e06a (patch)
tree72e6f4a528d01130863f559c60aed0223b765d18 /drivers/spi
parent020fe3fe11255cc3d8e67d5e53705c48deb19376 (diff)
downloadlinux-43f627ac9de42607b2cdcc7a41f2bcc82187e06a.tar.gz
linux-43f627ac9de42607b2cdcc7a41f2bcc82187e06a.tar.bz2
linux-43f627ac9de42607b2cdcc7a41f2bcc82187e06a.zip
spi: dw: fix memory leak on error path
Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-dw.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index 48ec161d6eed..bf98d63d92b3 100644
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -619,9 +619,11 @@ static int dw_spi_setup(struct spi_device *spi)
/* Only alloc on first setup */
chip = spi_get_ctldata(spi);
if (!chip) {
- chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);
+ chip = devm_kzalloc(&spi->dev, sizeof(struct chip_data),
+ GFP_KERNEL);
if (!chip)
return -ENOMEM;
+ spi_set_ctldata(spi, chip);
}
/*
@@ -666,7 +668,6 @@ static int dw_spi_setup(struct spi_device *spi)
| (spi->mode << SPI_MODE_OFFSET)
| (chip->tmode << SPI_TMOD_OFFSET);
- spi_set_ctldata(spi, chip);
return 0;
}