Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Conflicts:

	arch/sparc64/kernel/pci_psycho.c

1 files changed, 7 insertions, 4 deletions

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 369d39c3f745..9402fcaf04fa 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -596,10 +596,9 @@ static int wm8731_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;
 
@@ -617,7 +616,6 @@ static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind)
         return ret;
 
 err:
-        kfree(codec);
         kfree(i2c);
         return ret;
 }
@@ -693,6 +691,11 @@ static int wm8731_probe(struct platform_device *pdev)
 #else
         /* Add other interfaces here */
 #endif
+
+        if (ret != 0) {
+                kfree(codec->private_data);
+                kfree(codec);
+        }
         return ret;
 }