Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

PM: wakelocks: Don't report wake up wakelock if suspend aborted

Browse source 
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>
(cherry picked from commit ed27e538aa97278e26a6c00f14f6e2e076a1a2ae)
This commit is contained in:
Todd Poynor 2011-08-08 17:26:49 -07:00 committed by Stephen Boyd
parent cf83708fcc
commit a0c7f405af
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/power/wakelock.c
View file

@ -406,7 +406,7 @@ static int power_suspend_late(struct device *dev)
{ {
int ret = has_wake_lock(WAKE_LOCK_SUSPEND) ? -EAGAIN : 0; int ret = has_wake_lock(WAKE_LOCK_SUSPEND) ? -EAGAIN : 0;
#ifdef CONFIG_WAKELOCK_STAT #ifdef CONFIG_WAKELOCK_STAT
wait_for_wakeup = 1; wait_for_wakeup = !ret;
#endif #endif
if (debug_mask & DEBUG_SUSPEND) if (debug_mask & DEBUG_SUSPEND)
pr_info("power_suspend_late return %d\n", ret); pr_info("power_suspend_late return %d\n", ret);