summaryrefslogtreecommitdiffstats
path: root/drivers/base/power
diff options
context:
space:
mode:
authorBernie Thompson <bhthompson@chromium.org>2013-06-01 00:47:43 +0000
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-11 23:53:37 +0200
commit9350de06be45a5a8b927ac6577c9d35de61c90ca (patch)
treead2b68e1cfc2796fb355937a9347b4d6b3acdeb6 /drivers/base/power
parent43d51af489126305dbacc1b8ebd1ce4797d277ea (diff)
downloadop-kernel-dev-9350de06be45a5a8b927ac6577c9d35de61c90ca.zip
op-kernel-dev-9350de06be45a5a8b927ac6577c9d35de61c90ca.tar.gz
PM / wakeup: Adjust messaging for wake events during suspend
This adds in a new message to the wakeup code which adds an indication to the log that suspend was cancelled due to a wake event occouring during the suspend sequence. It also adjusts the message printed in suspend.c to reflect the potential that a suspend was aborted, as opposed to a device failing to suspend. Without these message adjustments one can end up with a kernel log that says that a device failed to suspend with no actual device suspend failures, which can be confusing to the log examiner. Signed-off-by: Bernie Thompson <bhthompson@chromium.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base/power')
-rw-r--r--drivers/base/power/wakeup.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 79715e7..407a2ef 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -707,8 +707,10 @@ bool pm_wakeup_pending(void)
}
spin_unlock_irqrestore(&events_lock, flags);
- if (ret)
+ if (ret) {
+ pr_info("PM: Wakeup pending, aborting suspend\n");
print_active_wakeup_sources();
+ }
return ret;
}
OpenPOWER on IntegriCloud