diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 15:43:13 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 15:43:13 +0300 |
| commit | b2faf597d93bdf5e2d12d93ea0815935a73f749e (patch) | |
| tree | 1876616290ff282b8a0814e2429d23e0104f3701 /drivers/acpi/sleep/poweroff.c | |
| parent | 638e174688f58200d0deb7435093435e7d737b09 (diff) | |
| parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) | |
| download | linux-b2faf597d93bdf5e2d12d93ea0815935a73f749e.tar.xz | |
Merge branch 'origin'
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) ACPI_FLUSH_CPU_CACHE(); acpi_enable_wakeup_device_prep(acpi_state); #endif - if (acpi_state == ACPI_STATE_S5) { - acpi_wakeup_gpe_poweroff_prepare(); - } + acpi_gpe_sleep_prepare(acpi_state); acpi_enter_sleep_state_prep(acpi_state); return 0; } @@ -53,11 +51,16 @@ void acpi_power_off(void) static int acpi_shutdown(struct sys_device *x) { - if (system_state == SYSTEM_POWER_OFF) { - /* Prepare if we are going to power off the system */ + switch (system_state) { + case SYSTEM_POWER_OFF: + /* Prepare to power off the system */ return acpi_sleep_prepare(ACPI_STATE_S5); + case SYSTEM_SUSPEND_DISK: + /* Prepare to suspend the system to disk */ + return acpi_sleep_prepare(ACPI_STATE_S4); + default: + return 0; } - return 0; } static struct sysdev_class acpi_sysclass = { |