From 5740d58f0e4d2bf621544977a5fce831097a82d1 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 26 Dec 2011 20:56:25 +0800 Subject: [PATCH] --- yaml --- r: 284021 b: refs/heads/master c: eb3bb97ce73ac666d9c3d16fc250fa0b78e3b8f2 h: refs/heads/master i: 284019: 3b604e97202e94187a8fc87adfdfa1e31dffaa4f v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/lm4857.c | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index aaff53b46308..5c686c7cbbbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 306bf6b19ee3da824fbdbdb2dc4e5d62a8983a2c +refs/heads/master: eb3bb97ce73ac666d9c3d16fc250fa0b78e3b8f2 diff --git a/trunk/sound/soc/codecs/lm4857.c b/trunk/sound/soc/codecs/lm4857.c index c387dafc6ab6..319039240e0f 100644 --- a/trunk/sound/soc/codecs/lm4857.c +++ b/trunk/sound/soc/codecs/lm4857.c @@ -215,7 +215,7 @@ static int __devinit lm4857_i2c_probe(struct i2c_client *i2c, struct lm4857 *lm4857; int ret; - lm4857 = kzalloc(sizeof(*lm4857), GFP_KERNEL); + lm4857 = devm_kzalloc(&i2c->dev, sizeof(*lm4857), GFP_KERNEL); if (!lm4857) return -ENOMEM; @@ -225,21 +225,12 @@ static int __devinit lm4857_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_lm4857, NULL, 0); - if (ret) { - kfree(lm4857); - return ret; - } - - return 0; + return ret; } static int __devexit lm4857_i2c_remove(struct i2c_client *i2c) { - struct lm4857 *lm4857 = i2c_get_clientdata(i2c); - snd_soc_unregister_codec(&i2c->dev); - kfree(lm4857); - return 0; }