From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 16 Dec 2011 06:56:02 +0000 (+0100)
Subject: ASoC: Convert wm8961 to devm_kzalloc()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2ec2a9061dac94ca4c5af13566fe107d84c30d4e;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

ASoC: Convert wm8961 to devm_kzalloc()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index 13a085040900..8bcc17a61329 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -1087,7 +1087,8 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
 	struct wm8961_priv *wm8961;
 	int ret;
 
-	wm8961 = kzalloc(sizeof(struct wm8961_priv), GFP_KERNEL);
+	wm8961 = devm_kzalloc(&i2c->dev, sizeof(struct wm8961_priv),
+			      GFP_KERNEL);
 	if (wm8961 == NULL)
 		return -ENOMEM;
 
@@ -1095,15 +1096,14 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
 
 	ret = snd_soc_register_codec(&i2c->dev,
 			&soc_codec_dev_wm8961, &wm8961_dai, 1);
-	if (ret < 0)
-		kfree(wm8961);
+
 	return ret;
 }
 
 static __devexit int wm8961_i2c_remove(struct i2c_client *client)
 {
 	snd_soc_unregister_codec(&client->dev);
-	kfree(i2c_get_clientdata(client));
+
 	return 0;
 }