diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-12-03 22:58:31 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2010-12-24 15:02:42 +0100 |
| commit | a2867e08c8e3bdbc00caf56bc3bdde19ccc058e3 (patch) | |
| tree | 34cee3dede448f30bb100d8301c422f481678bcc /kernel/power/suspend.c | |
| parent | 1e75227ef0571031cd18536ab768ee35667ec5b9 (diff) | |
| download | op-kernel-dev-a2867e08c8e3bdbc00caf56bc3bdde19ccc058e3.zip op-kernel-dev-a2867e08c8e3bdbc00caf56bc3bdde19ccc058e3.tar.gz | |
PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()
To avoid confusion with the meaning and return value of
pm_check_wakeup_events() replace it with pm_wakeup_pending() that
will work the other way around (ie. return true when system-wide
power transition should be aborted).
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel/power/suspend.c')
| -rw-r--r-- | kernel/power/suspend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index ecf7705..5e644e3 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -163,7 +163,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; } |
