diff options
author | Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> | 2005-12-01 04:29:00 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-12-15 13:28:14 -0500 |
commit | 729b4d4ce1982c52040bbf22d6711cdf8db07ad8 (patch) | |
tree | 1ae8b12dcbcd17c364f2df28db8ab3db9c8b89a2 /drivers/acpi/sleep/poweroff.c | |
parent | 7116317dc9148d783846299fc80a7d377baa6dca (diff) |
[ACPI] fix reboot upon suspend-to-disk
http://bugzilla.kernel.org/show_bug.cgi?id=4320
Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/sleep/poweroff.c')
-rw-r--r-- | drivers/acpi/sleep/poweroff.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c index af7935a95bcc..47fb4b394eec 100644 --- a/drivers/acpi/sleep/poweroff.c +++ b/drivers/acpi/sleep/poweroff.c | |||
@@ -33,9 +33,7 @@ int acpi_sleep_prepare(u32 acpi_state) | |||
33 | ACPI_FLUSH_CPU_CACHE(); | 33 | ACPI_FLUSH_CPU_CACHE(); |
34 | acpi_enable_wakeup_device_prep(acpi_state); | 34 | acpi_enable_wakeup_device_prep(acpi_state); |
35 | #endif | 35 | #endif |
36 | if (acpi_state == ACPI_STATE_S5) { | 36 | acpi_gpe_sleep_prepare(acpi_state); |
37 | acpi_wakeup_gpe_poweroff_prepare(); | ||
38 | } | ||
39 | acpi_enter_sleep_state_prep(acpi_state); | 37 | acpi_enter_sleep_state_prep(acpi_state); |
40 | return 0; | 38 | return 0; |
41 | } | 39 | } |
@@ -53,11 +51,16 @@ void acpi_power_off(void) | |||
53 | 51 | ||
54 | static int acpi_shutdown(struct sys_device *x) | 52 | static int acpi_shutdown(struct sys_device *x) |
55 | { | 53 | { |
56 | if (system_state == SYSTEM_POWER_OFF) { | 54 | switch (system_state) { |
57 | /* Prepare if we are going to power off the system */ | 55 | case SYSTEM_POWER_OFF: |
56 | /* Prepare to power off the system */ | ||
58 | return acpi_sleep_prepare(ACPI_STATE_S5); | 57 | return acpi_sleep_prepare(ACPI_STATE_S5); |
58 | case SYSTEM_SUSPEND_DISK: | ||
59 | /* Prepare to suspend the system to disk */ | ||
60 | return acpi_sleep_prepare(ACPI_STATE_S4); | ||
61 | default: | ||
62 | return 0; | ||
59 | } | 63 | } |
60 | return 0; | ||
61 | } | 64 | } |
62 | 65 | ||
63 | static struct sysdev_class acpi_sysclass = { | 66 | static struct sysdev_class acpi_sysclass = { |