diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-07-19 10:47:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 19:04:42 +0200 |
| commit | d7372cdf6938ccea23ec9fc68970702fed9ec3c8 (patch) | |
| tree | bd16d092edccbedf8c1fb5ad0baea0f89276ac71 | |
| parent | PM: Reduce code duplication between main.c and user.c (diff) | |
| download | linux-d7372cdf6938ccea23ec9fc68970702fed9ec3c8.tar.xz linux-d7372cdf6938ccea23ec9fc68970702fed9ec3c8.zip | |
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 <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | 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 d9801eff6489..240dde9cf13a 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); - case SYSTEM_SUSPEND_DISK: - /* Prepare to suspend the system to disk */ - return acpi_sleep_prepare(ACPI_STATE_S4); default: return 0; } |