diff options
| author | Todd Poynor <toddpoynor@google.com> | 2011-08-08 17:26:49 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2011-08-08 19:03:09 -0700 |
| commit | ed27e538aa97278e26a6c00f14f6e2e076a1a2ae (patch) | |
| tree | e093cde0093c10dd6b2f070fc6aa1a3f4967e436 /kernel/power | |
| parent | b7a82d40f1d9dc7a69281fc3b2a42a489f2a1619 (diff) | |
| download | kernel_samsung_tuna-ed27e538aa97278e26a6c00f14f6e2e076a1a2ae.zip kernel_samsung_tuna-ed27e538aa97278e26a6c00f14f6e2e076a1a2ae.tar.gz kernel_samsung_tuna-ed27e538aa97278e26a6c00f14f6e2e076a1a2ae.tar.bz2 | |
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>
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/wakelock.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ static int power_suspend_late(struct device *dev) { 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); |