From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 9 Aug 2010 06:51:15 +0000 (+0800)
Subject: mfd: Fix incorrect kfree(i2c) in wm831x-core i2c_driver probe
X-Git-Tag: v2.6.36-rc1~59^2~1
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=a2cddb6e416721cfe07770c264100607997fd8cb;p=net-next-2.6.git

mfd: Fix incorrect kfree(i2c) in wm831x-core i2c_driver probe

The i2c_client received in probe() should not be kfree()'d.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index cb94e7e1e6e..1e7aaaf6cc6 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1757,10 +1757,8 @@ static int wm831x_i2c_probe(struct i2c_client *i2c,
 	struct wm831x *wm831x;
 
 	wm831x = kzalloc(sizeof(struct wm831x), GFP_KERNEL);
-	if (wm831x == NULL) {
-		kfree(i2c);
+	if (wm831x == NULL)
 		return -ENOMEM;
-	}
 
 	i2c_set_clientdata(i2c, wm831x);
 	wm831x->dev = &i2c->dev;