git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspen...
[pandora-kernel.git]
/
drivers
/
mfd
/
wm8400-core.c
diff --git
a/drivers/mfd/wm8400-core.c
b/drivers/mfd/wm8400-core.c
index
e08aafa
..
3a6e78c
100644
(file)
--- a/
drivers/mfd/wm8400-core.c
+++ b/
drivers/mfd/wm8400-core.c
@@
-245,7
+245,7
@@
static int wm8400_register_codec(struct wm8400 *wm8400)
{
struct mfd_cell cell = {
.name = "wm8400-codec",
{
struct mfd_cell cell = {
.name = "wm8400-codec",
- .
driver
_data = wm8400,
+ .
mfd
_data = wm8400,
};
return mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0);
};
return mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0);
@@
-415,7
+415,6
@@
static int wm8400_i2c_probe(struct i2c_client *i2c,
return 0;
struct_err:
return 0;
struct_err:
- i2c_set_clientdata(i2c, NULL);
kfree(wm8400);
err:
return ret;
kfree(wm8400);
err:
return ret;
@@
-426,7
+425,6
@@
static int wm8400_i2c_remove(struct i2c_client *i2c)
struct wm8400 *wm8400 = i2c_get_clientdata(i2c);
wm8400_release(wm8400);
struct wm8400 *wm8400 = i2c_get_clientdata(i2c);
wm8400_release(wm8400);
- i2c_set_clientdata(i2c, NULL);
kfree(wm8400);
return 0;
kfree(wm8400);
return 0;