aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-11-22 08:34:07 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-22 20:31:14 +0000
commitc7b642911ea0fa9168425757752f094a1255209a (patch)
tree545df774e48939afd721d02a4d0b38f6695bb531
parent851cad5aa11a0692c4c92ebbfa94d06564034dcc (diff)
downloadkernel_goldelico_gta04-c7b642911ea0fa9168425757752f094a1255209a.zip
kernel_goldelico_gta04-c7b642911ea0fa9168425757752f094a1255209a.tar.gz
kernel_goldelico_gta04-c7b642911ea0fa9168425757752f094a1255209a.tar.bz2
ASoC: Fix a memory leak in alc5623_i2c_probe error path
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>
-rw-r--r--sound/soc/codecs/alc5623.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c
index e84b26b..9783e7e 100644
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
@@ -1022,10 +1022,8 @@ static int alc5623_i2c_probe(struct i2c_client *client,
dev_dbg(&client->dev, "Found codec id : alc56%02x\n", vid2);
alc5623 = kzalloc(sizeof(struct alc5623_priv), GFP_KERNEL);
- if (alc5623 == NULL) {
- ret = -ENOMEM;
- goto err;
- }
+ if (alc5623 == NULL)
+ return -ENOMEM;
pdata = client->dev.platform_data;
if (pdata) {
@@ -1056,12 +1054,9 @@ static int alc5623_i2c_probe(struct i2c_client *client,
&soc_codec_device_alc5623, &alc5623_dai, 1);
if (ret != 0) {
dev_err(&client->dev, "Failed to register codec: %d\n", ret);
- goto err;
+ kfree(alc5623);
}
- return 0;
-
-err:
return ret;
}