diff options
| author | Len Brown <len.brown@intel.com> | 2007-10-10 00:27:44 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-10-10 00:27:44 -0400 |
| commit | e67c5d8df119d5e85c0b7525a6c9d356ac6f7989 (patch) | |
| tree | 71293beac1caa5acb8ff370769189b6311b66adc | |
| parent | 67e74fdd81349a92fcece318a5ee41714273eb01 (diff) | |
| parent | 6cffd46651b881a11791a7ef4d99f2f20853fcd9 (diff) | |
| download | linux-e67c5d8df119d5e85c0b7525a6c9d356ac6f7989.tar.gz linux-e67c5d8df119d5e85c0b7525a6c9d356ac6f7989.tar.bz2 linux-e67c5d8df119d5e85c0b7525a6c9d356ac6f7989.zip | |
Pull suspend into release branch
| -rw-r--r-- | drivers/acpi/hardware/hwsleep.c | 10 | ||||
| -rw-r--r-- | drivers/acpi/sleep/main.c | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c index cf69c0040a39..8181afbd1d4d 100644 --- a/drivers/acpi/hardware/hwsleep.c +++ b/drivers/acpi/hardware/hwsleep.c @@ -234,15 +234,11 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state) "While executing method _SST")); } - /* - * 1) Disable/Clear all GPEs - */ + /* Disable/Clear all GPEs */ + status = acpi_hw_disable_all_gpes(); - if (ACPI_FAILURE(status)) { - return_ACPI_STATUS(status); - } - return_ACPI_STATUS(AE_OK); + return_ACPI_STATUS(status); } ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep) diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 2cbb9aabd00e..caf8721ae6fb 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c @@ -256,6 +256,11 @@ static int acpi_hibernation_enter(void) static void acpi_hibernation_finish(void) { + /* + * If ACPI is not enabled by the BIOS and the boot kernel, we need to + * enable it here. + */ + acpi_enable(); acpi_leave_sleep_state(ACPI_STATE_S4); acpi_disable_wakeup_device(ACPI_STATE_S4); |