diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-29 23:02:17 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-29 23:02:17 +0200 |
| commit | 27a639a92d3289c4851105efcbc2f8b88969194f (patch) | |
| tree | 09ee327d3ed3e2c40d5dc3b0f6b283477282deec /drivers/acpi | |
| parent | [ACPI] Reduce acpi-cpufreq switching latency by 50% (diff) | |
| parent | [PATCH] missing include in smc-ultra (diff) | |
| download | linux-27a639a92d3289c4851105efcbc2f8b88969194f.tar.xz linux-27a639a92d3289c4851105efcbc2f8b88969194f.zip | |
Auto-update from upstream
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/sleep/poweroff.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c index f8538b5b893e..a5f947de879b 100644 --- a/drivers/acpi/sleep/poweroff.c +++ b/drivers/acpi/sleep/poweroff.c @@ -55,7 +55,11 @@ void acpi_power_off(void) static int acpi_shutdown(struct sys_device *x) { - return acpi_sleep_prepare(ACPI_STATE_S5); + if (system_state == SYSTEM_POWER_OFF) { + /* Prepare if we are going to power off the system */ + return acpi_sleep_prepare(ACPI_STATE_S5); + } + return 0; } static struct sysdev_class acpi_sysclass = { |