-stable review patch.  If anyone has any objections, please let us know.

From: Alexey Starikovskiy <[EMAIL PROTECTED]>

commit 1dbc1fda5d8ca907f320b806005d4a447977d26a in mainline.

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.

[EMAIL PROTECTED]: backport to 2.6.23]

Signed-off-by: Alexey Starikovskiy <[EMAIL PROTECTED]>
Acked-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
Cc: Chuck Ebbert <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>

 drivers/acpi/sleep/main.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -170,8 +170,8 @@ static int acpi_pm_finish(suspend_state_
        u32 acpi_state = acpi_target_sleep_state;
-       acpi_leave_sleep_state(acpi_state);
+       acpi_leave_sleep_state(acpi_state);
        /* reset firmware waking vector */
        acpi_set_firmware_waking_vector((acpi_physical_address) 0);
@@ -256,8 +256,8 @@ static int acpi_hibernation_enter(void)
 static void acpi_hibernation_finish(void)
-       acpi_leave_sleep_state(ACPI_STATE_S4);
+       acpi_leave_sleep_state(ACPI_STATE_S4);
        /* reset firmware waking vector */
        acpi_set_firmware_waking_vector((acpi_physical_address) 0);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to