aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/power/main.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-12-03 16:58:31 -0500
committerRafael J. Wysocki <rjw@sisk.pl>2010-12-24 09:02:42 -0500
commita2867e08c8e3bdbc00caf56bc3bdde19ccc058e3 (patch)
tree34cee3dede448f30bb100d8301c422f481678bcc /drivers/base/power/main.c
parent1e75227ef0571031cd18536ab768ee35667ec5b9 (diff)
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 'drivers/base/power/main.c')
-rw-r--r--drivers/base/power/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 4747a1e8b44a..8a5258339ca2 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1056,7 +1056,7 @@ static int dpm_prepare(pm_message_t state)
1056 if (pm_runtime_barrier(dev) && device_may_wakeup(dev)) 1056 if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
1057 pm_wakeup_event(dev, 0); 1057 pm_wakeup_event(dev, 0);
1058 1058
1059 if (!pm_check_wakeup_events()) { 1059 if (pm_wakeup_pending()) {
1060 pm_runtime_put_sync(dev); 1060 pm_runtime_put_sync(dev);
1061 error = -EBUSY; 1061 error = -EBUSY;
1062 } else { 1062 } else {