From 1ca733df82741e98acef215d2705a4f03f4feb09 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Tue, 24 Jul 2007 11:58:39 +0200 Subject: [PATCH] --- yaml --- r: 62905 b: refs/heads/master c: 50ad147aa09c829cd452fae6ca99396c0b5b0695 h: refs/heads/master i: 62903: 6b88887f1252d62c0dee54307e7a03148f93c0fd v: v3 --- [refs] | 2 +- trunk/drivers/acpi/sleep/main.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5e5b20db3f51..baf4e13bf312 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10b3dcae0f275e2546e55303d64ddbb58cec7599 +refs/heads/master: 50ad147aa09c829cd452fae6ca99396c0b5b0695 diff --git a/trunk/drivers/acpi/sleep/main.c b/trunk/drivers/acpi/sleep/main.c index 55eca6eabcd8..29bdb013f46c 100644 --- a/trunk/drivers/acpi/sleep/main.c +++ b/trunk/drivers/acpi/sleep/main.c @@ -81,8 +81,8 @@ static int acpi_pm_prepare(suspend_state_t pm_state) * acpi_pm_enter - Actually enter a sleep state. * @pm_state: ignored * - * Flush caches and go to sleep. For STR or S2, we have to call - * arch-specific assembly, which in turn call acpi_enter_sleep_state(). + * Flush caches and go to sleep. For STR we have to call arch-specific + * assembly, which in turn call acpi_enter_sleep_state(). * It's unfortunate, but it works. Please fix if you're feeling frisky. */ @@ -95,7 +95,7 @@ static int acpi_pm_enter(suspend_state_t pm_state) ACPI_FLUSH_CPU_CACHE(); /* Do arch specific saving of state. */ - if (acpi_state == ACPI_STATE_S2 || acpi_state == ACPI_STATE_S3) { + if (acpi_state == ACPI_STATE_S3) { int error = acpi_save_state_mem(); if (error) { @@ -112,7 +112,6 @@ static int acpi_pm_enter(suspend_state_t pm_state) status = acpi_enter_sleep_state(acpi_state); break; - case ACPI_STATE_S2: case ACPI_STATE_S3: do_suspend_lowlevel(); break; @@ -129,7 +128,7 @@ static int acpi_pm_enter(suspend_state_t pm_state) printk(KERN_DEBUG "Back to C!\n"); /* restore processor state */ - if (acpi_state == ACPI_STATE_S2 || acpi_state == ACPI_STATE_S3) + if (acpi_state == ACPI_STATE_S3) acpi_restore_state_mem(); return ACPI_SUCCESS(status) ? 0 : -EFAULT;