From 0c202e4ec3f0d03fab86e593f9d4db40b01b0b5d Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 29 Dec 2011 21:16:59 +0000
Subject: [PATCH] --- yaml --- r: 293176 b: refs/heads/master c:
 42dad0d84a318d5245b8b311644388dae5f521c0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d6821c34371b..c400b987f3df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5531205f51c6f5f073fd0c63cfa9659fa4d912b
+refs/heads/master: 42dad0d84a318d5245b8b311644388dae5f521c0
diff --git a/trunk/sound/soc/codecs/wm8940.c b/trunk/sound/soc/codecs/wm8940.c
index ffc123bc943b..ae1933ed3e07 100644
--- a/trunk/sound/soc/codecs/wm8940.c
+++ b/trunk/sound/soc/codecs/wm8940.c
@@ -749,7 +749,8 @@ static __devinit int wm8940_i2c_probe(struct i2c_client *i2c,
 	struct wm8940_priv *wm8940;
 	int ret;
 
-	wm8940 = kzalloc(sizeof(struct wm8940_priv), GFP_KERNEL);
+	wm8940 = devm_kzalloc(&i2c->dev, sizeof(struct wm8940_priv),
+			      GFP_KERNEL);
 	if (wm8940 == NULL)
 		return -ENOMEM;
 
@@ -758,15 +759,14 @@ static __devinit int wm8940_i2c_probe(struct i2c_client *i2c,
 
 	ret = snd_soc_register_codec(&i2c->dev,
 			&soc_codec_dev_wm8940, &wm8940_dai, 1);
-	if (ret < 0)
-		kfree(wm8940);
+
 	return ret;
 }
 
 static __devexit int wm8940_i2c_remove(struct i2c_client *client)
 {
 	snd_soc_unregister_codec(&client->dev);
-	kfree(i2c_get_clientdata(client));
+
 	return 0;
 }