Commit:     d7372cdf6938ccea23ec9fc68970702fed9ec3c8
Parent:     6c961dfb7c903cfd1cd71b506863894038fd704f
Author:     Rafael J. Wysocki <[EMAIL PROTECTED]>
AuthorDate: Thu Jul 19 01:47:39 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Jul 19 10:04:42 2007 -0700

    ACPI: Do not prepare for hibernation in acpi_shutdown
    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]>
    Acked-by: Pavel Machek <[EMAIL PROTECTED]>
    Cc: Len Brown <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/acpi/sleep/poweroff.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
index d9801ef..240dde9 100644
--- a/drivers/acpi/sleep/poweroff.c
+++ b/drivers/acpi/sleep/poweroff.c
@@ -54,9 +54,6 @@ static int acpi_shutdown(struct sys_device *x)
        case SYSTEM_POWER_OFF:
                /* Prepare to power off the system */
                return acpi_sleep_prepare(ACPI_STATE_S5);
-               /* Prepare to suspend the system to disk */
-               return acpi_sleep_prepare(ACPI_STATE_S4);
                return 0;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to