aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-08-09 02:51:15 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2010-08-12 05:28:13 -0400
commita2cddb6e416721cfe07770c264100607997fd8cb (patch)
tree1af3f3ee0795677f87766e9f51f91f32f2096eaf /drivers
parent04a064236da3d8db24232983f99cfcfa5a4e5ade (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/wm831x-core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index cb94e7e1e6ea..1e7aaaf6cc6f 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,
1757 struct wm831x *wm831x; 1757 struct wm831x *wm831x;
1758 1758
1759 wm831x = kzalloc(sizeof(struct wm831x), GFP_KERNEL); 1759 wm831x = kzalloc(sizeof(struct wm831x), GFP_KERNEL);
1760 if (wm831x == NULL) { 1760 if (wm831x == NULL)
1761 kfree(i2c);
1762 return -ENOMEM; 1761 return -ENOMEM;
1763 }
1764 1762
1765 i2c_set_clientdata(i2c, wm831x); 1763 i2c_set_clientdata(i2c, wm831x);
1766 wm831x->dev = &i2c->dev; 1764 wm831x->dev = &i2c->dev;