Commit d7372cdf authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds

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: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6c961dfb
...@@ -54,9 +54,6 @@ static int acpi_shutdown(struct sys_device *x) ...@@ -54,9 +54,6 @@ static int acpi_shutdown(struct sys_device *x)
case SYSTEM_POWER_OFF: case SYSTEM_POWER_OFF:
/* Prepare to power off the system */ /* Prepare to power off the system */
return acpi_sleep_prepare(ACPI_STATE_S5); 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: default:
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment