]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
mfd: Fix incorrect kfree(i2c) in wm831x-core i2c_driver probe
authorAxel Lin <axel.lin@gmail.com>
Mon, 9 Aug 2010 06:51:15 +0000 (14:51 +0800)
committerSamuel Ortiz <sameo@linux.intel.com>
Thu, 12 Aug 2010 09:28:13 +0000 (11:28 +0200)
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>
drivers/mfd/wm831x-core.c

index cb94e7e1e6eae254382c48e95499bd52d8f22f1b..1e7aaaf6cc6f871e49c7a59e1cb72d42020a197d 100644 (file)
@@ -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;