X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fpower%2Fsuspend.c;h=8850df68794d89999272156ff06a2f8a0115fe4c;hb=d24450e2075b9ceeef8ad942e6391bc73eae6933;hp=031d5e3a61973464eec7e0e72791e423bfb3396f;hpb=56b85f32d530d09d6805488ad00775d4e0e3baab;p=~andy%2Flinux

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 031d5e3a619..8850df68794 100644
--- 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;
 		}