diff options
| author | Bernie Thompson <bhthompson@chromium.org> | 2013-06-01 00:47:43 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-11 23:53:37 +0200 |
| commit | 9350de06be45a5a8b927ac6577c9d35de61c90ca (patch) | |
| tree | ad2b68e1cfc2796fb355937a9347b4d6b3acdeb6 /kernel/power/suspend.c | |
| parent | 43d51af489126305dbacc1b8ebd1ce4797d277ea (diff) | |
| download | op-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 '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 bef86d1..ece0422 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -269,7 +269,7 @@ int suspend_devices_and_enter(suspend_state_t state) suspend_test_start(); error = dpm_suspend_start(PMSG_SUSPEND); if (error) { - printk(KERN_ERR "PM: Some devices failed to suspend\n"); + pr_err("PM: Some devices failed to suspend, or early wake event detected\n"); goto Recover_platform; } suspend_test_finish("suspend devices"); |
