From: Rafael J. Wysocki <[EMAIL PROTECTED]>
Since we are now explicitly calling hibernation_ops->prepare() before
hibernation_ops->enter() in hibernation_platform_enter() (defined in
kernel/power/disk.c), ACPI should not call acpi_sleep_prepare(ACPI_STATE_S4)
from acpi_shutdown().
Signed-off-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
---
drivers/acpi/sleep/poweroff.c | 3 ---
1 file changed, 3 deletions(-)
Index: linux-2.6.22-rc6/drivers/acpi/sleep/poweroff.c
===================================================================
--- linux-2.6.22-rc6.orig/drivers/acpi/sleep/poweroff.c 2007-07-01
15:08:54.000000000 +0200
+++ linux-2.6.22-rc6/drivers/acpi/sleep/poweroff.c 2007-07-01
15:10:07.000000000 +0200
@@ -54,9 +54,6 @@ static int acpi_shutdown(struct sys_devi
case SYSTEM_POWER_OFF:
/* Prepare to power off the system */
return acpi_sleep_prepare(ACPI_STATE_S5);
- case SYSTEM_SUSPEND_DISK:
- /* Prepare to suspend the system to disk */
- return acpi_sleep_prepare(ACPI_STATE_S4);
default:
return 0;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
