leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: wm8940: fix a memory leak if wm8940_register return error

Browse Source 
This patch adds checking for wm8940_register return value,
and does kfree(wm8940) if wm8940_register() fail.

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>
This commit is contained in:
Axel Lin 2010-07-23 05:53:49 +00:00 committed by Mark Brown
parent 62f5ad6733
commit db1e18de98
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/codecs/wm8940.c
View File

@ -845,6 +845,7 @@ static void wm8940_unregister(struct wm8940_priv *wm8940)
static int wm8940_i2c_probe(struct i2c_client *i2c, static int wm8940_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
int ret;
struct wm8940_priv *wm8940; struct wm8940_priv *wm8940;
struct snd_soc_codec *codec; struct snd_soc_codec *codec;
@ -858,7 +859,11 @@ static int wm8940_i2c_probe(struct i2c_client *i2c,
codec->control_data = i2c; codec->control_data = i2c;
codec->dev = &i2c->dev; codec->dev = &i2c->dev;
return wm8940_register(wm8940, SND_SOC_I2C); ret = wm8940_register(wm8940, SND_SOC_I2C);
if (ret < 0)
kfree(wm8940);
return ret;
} }
static int __devexit wm8940_i2c_remove(struct i2c_client *client) static int __devexit wm8940_i2c_remove(struct i2c_client *client)