From 5ce00d762cd7beba3bf1ab7bb04e177321b448ba Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 23 Jul 2010 05:53:49 +0000 Subject: [PATCH] --- yaml --- r: 206641 b: refs/heads/master c: db1e18de98c8bdf8a2bfc07623ff67621aa4a332 h: refs/heads/master i: 206639: 768df51d2c320dab62e02b842e33307617bb2c9f v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8940.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c956bb0ba59f..1b757bf81103 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62f5ad6733b872e14d671b615850eb5bd1cd7e30 +refs/heads/master: db1e18de98c8bdf8a2bfc07623ff67621aa4a332 diff --git a/trunk/sound/soc/codecs/wm8940.c b/trunk/sound/soc/codecs/wm8940.c index e3c4bbfaae27..f0c11138e610 100644 --- a/trunk/sound/soc/codecs/wm8940.c +++ b/trunk/sound/soc/codecs/wm8940.c @@ -845,6 +845,7 @@ static void wm8940_unregister(struct wm8940_priv *wm8940) static int wm8940_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { + int ret; struct wm8940_priv *wm8940; struct snd_soc_codec *codec; @@ -858,7 +859,11 @@ static int wm8940_i2c_probe(struct i2c_client *i2c, codec->control_data = i2c; 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)