Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 6 insertions, 4 deletions

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index c6a8edf302ad..dd1f55404b29 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -869,10 +869,9 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind)
         client_template.addr = addr;
 
         i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL);
-        if (i2c == NULL) {
-                kfree(codec);
+        if (i2c == NULL)
                 return -ENOMEM;
-        }
+
         i2c_set_clientdata(i2c, codec);
         codec->control_data = i2c;
 
@@ -890,7 +889,6 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind)
         return ret;
 
 err:
-        kfree(codec);
         kfree(i2c);
         return ret;
 }
@@ -966,6 +964,10 @@ static int wm8750_probe(struct platform_device *pdev)
                 /* Add other interfaces here */
 #endif
 
+        if (ret != 0) {
+                kfree(codec->private_data);
+                kfree(codec);
+        }
         return ret;
 }