projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'amba', 'devel-stable', 'kexec-for-next' and 'misc' into for-linus
[cascardo/linux.git]
/
drivers
/
base
/
power
/
wakeup.c
diff --git
a/drivers/base/power/wakeup.c
b/drivers/base/power/wakeup.c
index
a1e0b9a
..
5fb7718
100644
(file)
--- a/
drivers/base/power/wakeup.c
+++ b/
drivers/base/power/wakeup.c
@@
-246,6
+246,8
@@
static int device_wakeup_attach(struct device *dev, struct wakeup_source *ws)
return -EEXIST;
}
dev->power.wakeup = ws;
+ if (dev->power.wakeirq)
+ device_wakeup_attach_irq(dev, dev->power.wakeirq);
spin_unlock_irq(&dev->power.lock);
return 0;
}