aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-11-16 03:09:41 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-16 06:23:50 -0500
commit4ab867d276b83582f15c61270de1cc178df95659 (patch)
tree4658b61b780b6b3b63ca7a1201e763997a320381 /sound
parent50d0ac2e1e98efa89f6dc167977b1a0d46d5e48e (diff)
ASoC: Fix incorrect kfree in aic3x_probe error path
We allocated memory for aic3x in aic3x_i2c_probe, and will free the memory in either aic3x_i2c_probe error path or aic3x_i2c_remove. Thus we should not call kfree(aic3x) in aic3x_probe, otherwise we have double free of aic3x. 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')
-rw-r--r--sound/soc/codecs/tlv320aic3x.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 6173c2b4c364..df726a5066e8 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1419,7 +1419,6 @@ err_get:
1419 if (aic3x->gpio_reset >= 0) 1419 if (aic3x->gpio_reset >= 0)
1420 gpio_free(aic3x->gpio_reset); 1420 gpio_free(aic3x->gpio_reset);
1421err_gpio: 1421err_gpio:
1422 kfree(aic3x);
1423 return ret; 1422 return ret;
1424} 1423}
1425 1424