diff options
| author | Axel Lin <axel.lin@gmail.com> | 2010-11-16 09:10:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-16 12:24:04 +0100 |
| commit | 01cbea3293929acecef6785b7ea5be547dc039bc (patch) | |
| tree | 1f11817219084470ad157636f229917beb7a9813 /sound/soc | |
| parent | ASoC: Fix incorrect kfree in aic3x_probe error path (diff) | |
| download | linux-01cbea3293929acecef6785b7ea5be547dc039bc.tar.xz linux-01cbea3293929acecef6785b7ea5be547dc039bc.zip | |
ASoC: Fix incorrect kfree in wm8731_probe error path
We allocated memory for wm8731 in wm8731_spi_probe / wm8731_i2c_probe,
and will free the memory in either wm8731_spi_probe / wm8731_i2c_probe
error path or wm8731_spi_remove / wm8731_i2c_remove.
Thus we should not call kfree(wm8731) in wm8731_probe, otherwise
we have double free of wm8731.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8731.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 95ade3245056..4b709589e26c 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -543,7 +543,6 @@ err_regulator_enable: err_regulator_get: regulator_bulk_free(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); - kfree(wm8731); return ret; } |