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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git]
/
kernel
/
power
/
suspend.c
diff --git
a/kernel/power/suspend.c
b/kernel/power/suspend.c
index
031d5e3
..
8850df6
100644
(file)
--- a/
kernel/power/suspend.c
+++ b/
kernel/power/suspend.c
@@
-164,7
+164,7
@@
static int suspend_enter(suspend_state_t state)
error = sysdev_suspend(PMSG_SUSPEND);
if (!error) {
- if (!
suspend_test(TEST_CORE) && pm_check_wakeup_events(
)) {
+ if (!
(suspend_test(TEST_CORE) || pm_wakeup_pending()
)) {
error = suspend_ops->enter(state);
events_check_enabled = false;
}