OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
04a0642
)
mfd: Fix incorrect kfree(i2c) in wm831x-core i2c_driver probe
author
Axel Lin
<axel.lin@gmail.com>
Mon, 9 Aug 2010 06:51:15 +0000
(14:51 +0800)
committer
Samuel 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
patch
|
blob
|
history
diff --git
a/drivers/mfd/wm831x-core.c
b/drivers/mfd/wm831x-core.c
index
cb94e7e
..
1e7aaaf
100644
(file)
--- 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;