diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-07-26 16:29:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-26 21:13:06 +0200 |
| commit | 58b3b71dfaaecbf7cff1fe10c049d663f0313e5f (patch) | |
| tree | 38f34ce39e1c93d6d54730ead4e414a5070e3b45 /kernel/power | |
| parent | Revert most of "x86: Fix alternatives and kprobes to remap write-protected ke... (diff) | |
| download | linux-58b3b71dfaaecbf7cff1fe10c049d663f0313e5f.tar.xz linux-58b3b71dfaaecbf7cff1fe10c049d663f0313e5f.zip | |
Fix ThinkPad T42 poweroff failure introduced by by "PM: Introduce pm_power_off_prepare"
Commit bd804eba1c8597cbb7cd5a5f9fe886aae16a079a ("PM: Introduce
pm_power_off_prepare") caused problems in the poweroff path, as reported by
YOSHIFUJI Hideaki / 吉藤英明.
Generally, sysdev_shutdown() should be called after the ACPI preparation for
powering the system off. To make it happen, we can separate sysdev_shutdown()
from device_shutdown() and call it directly wherever necessary.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Tested-by: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/disk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index 324ac0188ce1..eb72255b5c86 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -216,6 +216,7 @@ int hibernation_platform_enter(void) * sleep state after all */ error = hibernation_ops->prepare(); + sysdev_shutdown(); if (!error) error = hibernation_ops->enter(); } else { |