From 960515f626e2c8ace7f6a05612eac30c5e4e5ccb Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 10 Sep 2012 16:18:56 +0800
Subject: [PATCH] --- yaml --- r: 332062 b: refs/heads/master c:
 7d014db8baf70bcc7e9cf1457350b11bc2affbbd h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8523.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9e3a8e02c96e..24cbecfebd63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ee01ac63b72a3101d6293b50d70d830959bbe8f
+refs/heads/master: 7d014db8baf70bcc7e9cf1457350b11bc2affbbd
diff --git a/trunk/sound/soc/codecs/wm8523.c b/trunk/sound/soc/codecs/wm8523.c
index 1c3ffb290cdc..af2289ee6cd6 100644
--- a/trunk/sound/soc/codecs/wm8523.c
+++ b/trunk/sound/soc/codecs/wm8523.c
@@ -516,7 +516,8 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c,
 	struct wm8523_priv *wm8523;
 	int ret;
 
-	wm8523 = kzalloc(sizeof(struct wm8523_priv), GFP_KERNEL);
+	wm8523 = devm_kzalloc(&i2c->dev, sizeof(struct wm8523_priv),
+			      GFP_KERNEL);
 	if (wm8523 == NULL)
 		return -ENOMEM;
 
@@ -525,8 +526,7 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c,
 
 	ret =  snd_soc_register_codec(&i2c->dev,
 			&soc_codec_dev_wm8523, &wm8523_dai, 1);
-	if (ret < 0)
-		kfree(wm8523);
+
 	return ret;
 
 }
@@ -534,7 +534,6 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c,
 static __devexit int wm8523_i2c_remove(struct i2c_client *client)
 {
 	snd_soc_unregister_codec(&client->dev);
-	kfree(i2c_get_clientdata(client));
 	return 0;
 }