aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8962.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-11-16 03:11:37 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-16 06:24:16 -0500
commitce0df3d79a1b305cb39ea15a07235b5a6c3435b6 (patch)
tree8bc3348d834f886c207832fcba51acdb9c6e186f /sound/soc/codecs/wm8962.c
parent01cbea3293929acecef6785b7ea5be547dc039bc (diff)
ASoC: Fix incorrect kfree in wm8962_probe error path
We allocated memory for wm8962 in wm8962_i2c_probe, and will free the memory in either wm8962_i2c_probe error path or wm8962_i2c_remove. Thus we should not call kfree(wm8962) in wm8962_probe, otherwise we have double free of wm8962. 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/codecs/wm8962.c')
-rw-r--r--sound/soc/codecs/wm8962.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index e021866f5a85..9f6beca951c4 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3874,7 +3874,6 @@ err_enable:
3874err_get: 3874err_get:
3875 regulator_bulk_free(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); 3875 regulator_bulk_free(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
3876err: 3876err:
3877 kfree(wm8962);
3878 return ret; 3877 return ret;
3879} 3878}
3880 3879