diff options
| author |   Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com> | 2007-03-12 14:49:26 -0400 |
|---|---|---|
| committer |   Len Brown <len.brown@intel.com> | 2007-03-12 14:49:26 -0400 |
| commit | 1d99967badac599c0d1db0b45c99e073e8e98cd4 (patch) | |
| tree | 895ca1ae4ee97d1479c5de4a763a0b851933d731 /drivers/acpi | |
| parent | Revert "USB: pxa2xx_udc: fix hardcoded irq number" (diff) | |
| download | linux-dev-1d99967badac599c0d1db0b45c99e073e8e98cd4.tar.xz linux-dev-1d99967badac599c0d1db0b45c99e073e8e98cd4.zip | |
ACPI: resolve HP nx6125 S3 immediate wakeup regression
Moving disable GPEs from enter_sleep up into sleep_prepare fixed
the disabled SCI on S4 on Acer laptops.
However, it caused an immediate S3 resume on the HP nx6125.
Apparently, on the HP, a GPE was getting re-enabled after
the prepare, but before the enter.
Close that window by restoring the GPE disable on enter.
This is redundant in most cases, but closes this window,
where S3 and S4 paths differ.
Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Acked-by: Ray Lee <ray-lk@madrabbit.org>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/hardware/hwsleep.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c index 8fa93125fd4c..c84b1faba28c 100644 --- a/drivers/acpi/hardware/hwsleep.c +++ b/drivers/acpi/hardware/hwsleep.c @@ -300,6 +300,11 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) /* * 2) Enable all wakeup GPEs */ + status = acpi_hw_disable_all_gpes(); + if (ACPI_FAILURE(status)) { + return_ACPI_STATUS(status); + } + acpi_gbl_system_awake_and_running = FALSE; status = acpi_hw_enable_all_wakeup_gpes(); |