diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-29 13:00:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-29 13:00:37 +0100 |
| commit | c00a30dfd0f0502102668bb43258742e07adf591 (patch) | |
| tree | 27233b3aa9ca7e909212937ead9bc623fc99b08a /kernel/power | |
| parent | 535ad2c06cf12f3f075e3d9a141476beb367ae6b (diff) | |
| parent | 3b08c7740bb1e0ef69c71c7232a870ca250a9e21 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/autosleep.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/autosleep.c b/kernel/power/autosleep.c index c6422ffeda9..9012ecf7b81 100644 --- a/kernel/power/autosleep.c +++ b/kernel/power/autosleep.c @@ -32,7 +32,8 @@ static void try_to_suspend(struct work_struct *work) mutex_lock(&autosleep_lock); - if (!pm_save_wakeup_count(initial_count)) { + if (!pm_save_wakeup_count(initial_count) || + system_state != SYSTEM_RUNNING) { mutex_unlock(&autosleep_lock); goto out; } |