From 78f5473f4066a3b1561b2c881b01b226128de4e7 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Thu, 29 Dec 2011 12:03:16 +0800
Subject: [PATCH] --- yaml --- r: 284048 b: refs/heads/master c:
 bf791bdb383fdf159c2282d958682b92a2601170 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/sound/soc/codecs/max9850.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 31bbd5691fdd..1bdf71dd0831 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1b548824ba7e182424da6e4655c1904be7dc6fa
+refs/heads/master: bf791bdb383fdf159c2282d958682b92a2601170
diff --git a/trunk/sound/soc/codecs/max9850.c b/trunk/sound/soc/codecs/max9850.c
index 47060d2afe90..a1913091f56c 100644
--- a/trunk/sound/soc/codecs/max9850.c
+++ b/trunk/sound/soc/codecs/max9850.c
@@ -335,7 +335,8 @@ static int __devinit max9850_i2c_probe(struct i2c_client *i2c,
 	struct max9850_priv *max9850;
 	int ret;
 
-	max9850 = kzalloc(sizeof(struct max9850_priv), GFP_KERNEL);
+	max9850 = devm_kzalloc(&i2c->dev, sizeof(struct max9850_priv),
+			       GFP_KERNEL);
 	if (max9850 == NULL)
 		return -ENOMEM;
 
@@ -343,15 +344,12 @@ static int __devinit max9850_i2c_probe(struct i2c_client *i2c,
 
 	ret = snd_soc_register_codec(&i2c->dev,
 			&soc_codec_dev_max9850, &max9850_dai, 1);
-	if (ret < 0)
-		kfree(max9850);
 	return ret;
 }
 
 static __devexit int max9850_i2c_remove(struct i2c_client *client)
 {
 	snd_soc_unregister_codec(&client->dev);
-	kfree(i2c_get_clientdata(client));
 	return 0;
 }