From: Ruchi Kandoi <kandoiruchi@google.com>
Date: Fri, 8 May 2015 02:07:42 +0000 (-0700)
Subject: PM / sleep: Return -EBUSY from suspend_enter() on wakeup detection
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=671767360db8fdd1f082d15fb4b0107c1bb94a0b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

PM / sleep: Return -EBUSY from suspend_enter() on wakeup detection

If a wakeup source is found to be pending in the last stage of
suspend after syscore suspend, then the machine won't suspend, but
suspend_enter() will return 0.  That is confusing, as wakeup detection
elsewhere causes -EBUSY to be returned from suspend_enter().

To avoid the confusion, make suspend_enter() return -EBUSY in that
case too.

Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
[ rjw: Subject and changelog ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 274371a71ed0..53266b729fd9 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -366,6 +366,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
 			trace_suspend_resume(TPS("machine_suspend"),
 				state, false);
 			events_check_enabled = false;
+		} else if (*wakeup) {
+			error = -EBUSY;
 		}
 		syscore_resume();
 	}