From 4caf7deae8adf242123bdc64a480d9bddac11f3a Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 12 Sep 2012 09:28:08 +0800 Subject: [PATCH] --- yaml --- r: 332091 b: refs/heads/master c: 046d4f02e8835ff78f8ba5a09e358b2bc4832903 h: refs/heads/master i: 332089: d1376a51eaac221449397742da39c86b0333af0e 332087: a6c95641e8f3c743fae3f25970b21176181728a4 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8991.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 986c7d64067f..d5134846a56e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 587cbbb36ef2657cd888b7705e02cfe96ab088b7 +refs/heads/master: 046d4f02e8835ff78f8ba5a09e358b2bc4832903 diff --git a/trunk/sound/soc/codecs/wm8991.c b/trunk/sound/soc/codecs/wm8991.c index b9dbfebbda13..fe439f027e10 100644 --- a/trunk/sound/soc/codecs/wm8991.c +++ b/trunk/sound/soc/codecs/wm8991.c @@ -1363,7 +1363,7 @@ static __devinit int wm8991_i2c_probe(struct i2c_client *i2c, struct wm8991_priv *wm8991; int ret; - wm8991 = kzalloc(sizeof *wm8991, GFP_KERNEL); + wm8991 = devm_kzalloc(&i2c->dev, sizeof(*wm8991), GFP_KERNEL); if (!wm8991) return -ENOMEM; @@ -1372,15 +1372,14 @@ static __devinit int wm8991_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8991, &wm8991_dai, 1); - if (ret < 0) - kfree(wm8991); + return ret; } static __devexit int wm8991_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - kfree(i2c_get_clientdata(client)); + return 0; }