diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-18 21:47:00 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-18 21:47:00 +0200 |
| commit | 5a8d2815593007d4eb59f337ef919c871c2649ab (patch) | |
| tree | 1bfbceb13c90b45bf0274f5430dcdbeea64427ff /kernel | |
| parent | Merge branch 'acpi-fixes' (diff) | |
| parent | cpufreq: Revert commit 2f7021a8 to fix CPU hotplug regression (diff) | |
| download | linux-dev-5a8d2815593007d4eb59f337ef919c871c2649ab.tar.xz linux-dev-5a8d2815593007d4eb59f337ef919c871c2649ab.zip | |
Merge branch 'pm-fixes'
* pm-fixes:
cpufreq: Revert commit 2f7021a8 to fix CPU hotplug regression
cpufreq: s3c24xx: fix "depends on ARM_S3C24XX" in Kconfig
cpufreq: s3c24xx: rename CONFIG_CPU_FREQ_S3C24XX_DEBUGFS
PM / Sleep: Fix comment typo in pm_wakeup.h
PM / Sleep: avoid 'autosleep' in shutdown progress
cpufreq: Revert commit a66b2e to fix suspend/resume regression
Diffstat (limited to 'kernel')
| -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; } |