Merge branch android-common-3.10

[firefly-linux-kernel-4.4.55.git] / kernel / power / suspend.c

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 82450c20875c3736f2579f9b86f302adeb542190..e2446e08c6b09305b22b1ef82d4dc1d36cf8356d 100644 (file)
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -224,10 +224,11 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
                if (!(suspend_test(TEST_CORE) || *wakeup)) {
                        error = suspend_ops->enter(state);
                        events_check_enabled = false;
-               } else {
+               } else if (*wakeup) {
                        pm_get_active_wakeup_sources(suspend_abort,
                                MAX_SUSPEND_ABORT_LEN);
                        log_suspend_abort_reason(suspend_abort);
+                       error = -EBUSY;
                }
                syscore_resume();
        }