diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-29 12:54:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-29 12:54:31 +0100 |
| commit | 3b08c7740bb1e0ef69c71c7232a870ca250a9e21 (patch) | |
| tree | fdf5bb7fe446f142ffd02cd4013721e75c9d880c /kernel/power | |
| parent | 04e780d9cc5d55b07286a5ecbc455c027a81ab7f (diff) | |
| parent | 6f7bb6bafb3153e9b9383f3f44a0f23fc00318d9 (diff) | |
Merge tag 'v3.10.4' into linux-linaro-lsk
This is the 3.10.4 stable release
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 c6422ffeda9a..9012ecf7b814 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; } |