On Tuesday, 16 October 2007 20:55, Alexey Starikovskiy wrote:
> acpi_leave_sleep_state() should have correct list of wake and
> runtime GPEs, which is available only after disable_wakeup_device()
> is called.
>
> Signed-off-by: Alexey Starikovskiy <astarikovskiy@xxxxxxx>
> ---
Ackedy-by: Rafael J. Wysocki <rjw@xxxxxxx>
> drivers/acpi/sleep/main.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
> index 5055acf..728d595 100644
> --- a/drivers/acpi/sleep/main.c
> +++ b/drivers/acpi/sleep/main.c
> @@ -170,8 +170,8 @@ static int acpi_pm_finish(suspend_state_t pm_state)
> {
> 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);
> @@ -256,8 +256,8 @@ static int acpi_hibernation_enter(void)
>
> static void acpi_hibernation_finish(void)
> {
> - 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);
>
>
>
--
"Premature optimization is the root of all evil." - Donald Knuth
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
