From fb1dc1b880f7d2a9740a40ea5711bc111e942c30 Mon Sep 17 00:00:00 2001 From: Alexey Starikovskiy Date: Mon, 22 Oct 2007 14:18:12 +0400 Subject: [PATCH] --- yaml --- r: 72813 b: refs/heads/master c: 1dbc1fda5d8ca907f320b806005d4a447977d26a h: refs/heads/master i: 72811: 270fc3e8f80a09037b446edf257c09e40fd4b7d3 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/sleep/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9017a19b6a51..ed03c6293d48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c1c6a1ba786d58bd03e27ee49f89a5685e8e07b +refs/heads/master: 1dbc1fda5d8ca907f320b806005d4a447977d26a diff --git a/trunk/drivers/acpi/sleep/main.c b/trunk/drivers/acpi/sleep/main.c index 2f9d3c19907c..2c0b6630f8ba 100644 --- a/trunk/drivers/acpi/sleep/main.c +++ b/trunk/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);