diff options
| author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2007-10-22 14:18:12 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-10-25 16:31:30 -0400 |
| commit | 1dbc1fda5d8ca907f320b806005d4a447977d26a (patch) | |
| tree | fcb1e1e85605f012c4b6faaf2f4115785bcbfeb7 /drivers/acpi/sleep/main.c | |
| parent | 9c1c6a1ba786d58bd03e27ee49f89a5685e8e07b (diff) | |
| download | lwn-1dbc1fda5d8ca907f320b806005d4a447977d26a.tar.gz lwn-1dbc1fda5d8ca907f320b806005d4a447977d26a.zip | |
ACPI: suspend: Wrong order of GPE restore.
acpi_leave_sleep_state() should have correct list of wake and
runtime GPEs, which is available only after disable_wakeup_device()
is called.
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/sleep/main.c')
| -rw-r--r-- | drivers/acpi/sleep/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 2f9d3c19907c..2c0b6630f8ba 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c @@ -167,8 +167,8 @@ static void acpi_pm_finish(void) { u32 acpi_state = acpi_target_sleep_state; - acpi_leave_sleep_state(acpi_state); acpi_disable_wakeup_device(acpi_state); + acpi_leave_sleep_state(acpi_state); /* reset firmware waking vector */ acpi_set_firmware_waking_vector((acpi_physical_address) 0); @@ -272,8 +272,8 @@ static void acpi_hibernation_finish(void) * enable it here. */ acpi_enable(); - acpi_leave_sleep_state(ACPI_STATE_S4); acpi_disable_wakeup_device(ACPI_STATE_S4); + acpi_leave_sleep_state(ACPI_STATE_S4); /* reset firmware waking vector */ acpi_set_firmware_waking_vector((acpi_physical_address) 0); |