diff options
-rw-r--r-- | drivers/base/power/wakeup.c | 4 | ||||
-rw-r--r-- | kernel/power/suspend.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index 79715e7fa43e..407a2efa10bb 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c | |||
@@ -707,8 +707,10 @@ bool pm_wakeup_pending(void) | |||
707 | } | 707 | } |
708 | spin_unlock_irqrestore(&events_lock, flags); | 708 | spin_unlock_irqrestore(&events_lock, flags); |
709 | 709 | ||
710 | if (ret) | 710 | if (ret) { |
711 | pr_info("PM: Wakeup pending, aborting suspend\n"); | ||
711 | print_active_wakeup_sources(); | 712 | print_active_wakeup_sources(); |
713 | } | ||
712 | 714 | ||
713 | return ret; | 715 | return ret; |
714 | } | 716 | } |
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index bef86d121eb2..ece04223bb1e 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c | |||
@@ -269,7 +269,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
269 | suspend_test_start(); | 269 | suspend_test_start(); |
270 | error = dpm_suspend_start(PMSG_SUSPEND); | 270 | error = dpm_suspend_start(PMSG_SUSPEND); |
271 | if (error) { | 271 | if (error) { |
272 | printk(KERN_ERR "PM: Some devices failed to suspend\n"); | 272 | pr_err("PM: Some devices failed to suspend, or early wake event detected\n"); |
273 | goto Recover_platform; | 273 | goto Recover_platform; |
274 | } | 274 | } |
275 | suspend_test_finish("suspend devices"); | 275 | suspend_test_finish("suspend devices"); |