Commit:     1d99967badac599c0d1db0b45c99e073e8e98cd4
Parent:     be521466feb3bb1cd89de82a2b1d080e9ebd3cb6
Author:     Alexey Starikovskiy <[EMAIL PROTECTED]>
AuthorDate: Mon Mar 12 14:49:26 2007 -0400
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Mon Mar 12 14:49:26 2007 -0400

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Len Brown <[EMAIL PROTECTED]>
    Acked-by: Ray Lee <[EMAIL PROTECTED]>
 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 8fa9312..c84b1fa 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 
         * 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();
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to