summary refs log tree commit diff
path: root/sound/soc
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-07-23 05:53:44 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-03 07:40:41 +0100
commit7bcaad919bc7aaa084f5884aa15654fe1fa4c77f (patch)
tree5fbee6344f610b7ebb598ca1c01240c644cb63b2 /sound/soc
parentfd3c8ac9cb653f7e3122bba9bc7beaad6062b7f4 (diff)
downloadlinux-7bcaad919bc7aaa084f5884aa15654fe1fa4c77f.tar.gz
ASoC: ak4642: fix a memory leak if failed to initialise AK4642
ak4642 should be kfreed if ak4642_init() return error.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Reviewed-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.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/ak4642.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 60b83b482467..3d7dc55305ec 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -498,8 +498,10 @@ static int ak4642_i2c_probe(struct i2c_client *i2c,
 	codec->control_data = i2c;
 
 	ret = ak4642_init(ak4642);
-	if (ret < 0)
+	if (ret < 0) {
 		printk(KERN_ERR "failed to initialise AK4642\n");
+		kfree(ak4642);
+	}
 
 	return ret;
 }