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
mfd: Move twl-core device_init_wakeup to after platform_device_add
[pandora-kernel.git]
/
drivers
/
mfd
/
twl-core.c
diff --git
a/drivers/mfd/twl-core.c
b/drivers/mfd/twl-core.c
index
967f9d0
..
eb714fd
100644
(file)
--- a/
drivers/mfd/twl-core.c
+++ b/
drivers/mfd/twl-core.c
@@
-561,7
+561,6
@@
add_numbered_child(unsigned chip, const char *name, int num,
goto err;
}
- device_init_wakeup(&pdev->dev, can_wakeup);
pdev->dev.parent = &twl->client->dev;
if (pdata) {
@@
-586,6
+585,8
@@
add_numbered_child(unsigned chip, const char *name, int num,
}
status = platform_device_add(pdev);
+ if (status == 0)
+ device_init_wakeup(&pdev->dev, can_wakeup);
err:
if (status < 0) {