PM: wakelocks: Don't report wake up wakelock if suspend aborted
If the wakelock driver aborts suspend due to an already-held
wakelock, don't report the next wakelock held as the "wake up
wakelock".
Change-Id: I582ffbb87a3c361739a77d839a0c62921cff11a6
Signed-off-by: Todd Poynor <toddpoynor@google.com>
diff --git a/kernel/power/wakelock.c b/kernel/power/wakelock.c
index c10d0ee..d45df2b 100644
--- a/kernel/power/wakelock.c
+++ b/kernel/power/wakelock.c
@@ -311,7 +311,7 @@
{
int ret = has_wake_lock(WAKE_LOCK_SUSPEND) ? -EAGAIN : 0;
#ifdef CONFIG_WAKELOCK_STAT
- wait_for_wakeup = 1;
+ wait_for_wakeup = !ret;
#endif
if (debug_mask & DEBUG_SUSPEND)
pr_info("power_suspend_late return %d\n", ret);