diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2005-08-27 00:56:18 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-27 10:11:40 -0700 |
| commit | 8dbddf17824861f2298de093549e6493d9844835 (patch) | |
| tree | 26d82a3ea3f1b7be05468ae7e811775851a06731 /drivers | |
| parent | 6a029a90f5b93e2b50bcbbaef05ef91fa0c1d6b3 (diff) | |
| download | kernel_samsung_aries-8dbddf17824861f2298de093549e6493d9844835.zip kernel_samsung_aries-8dbddf17824861f2298de093549e6493d9844835.tar.gz kernel_samsung_aries-8dbddf17824861f2298de093549e6493d9844835.tar.bz2 | |
[PATCH] acpi_shutdown: Only prepare for power off on power_off
When acpi_sleep_prepare was moved into a shutdown method we
started calling it for all shutdowns.
It appears this triggers some systems to power off on reboot.
Avoid this by only calling acpi_sleep_prepare if we are going to power
off the system.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -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 186b182..f93d2ee 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 = { |