aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-07-26 10:29:55 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-26 15:13:06 -0400
commit58b3b71dfaaecbf7cff1fe10c049d663f0313e5f (patch)
tree38f34ce39e1c93d6d54730ead4e414a5070e3b45 /kernel
parent602033ed5907a59ce86f709082a35be047743a86 (diff)
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')
-rw-r--r--kernel/power/disk.c1
-rw-r--r--kernel/sys.c3
2 files changed, 4 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)
216 * sleep state after all 216 * sleep state after all
217 */ 217 */
218 error = hibernation_ops->prepare(); 218 error = hibernation_ops->prepare();
219 sysdev_shutdown();
219 if (!error) 220 if (!error)
220 error = hibernation_ops->enter(); 221 error = hibernation_ops->enter();
221 } else { 222 } else {
diff --git a/kernel/sys.c b/kernel/sys.c
index 08562f419768..14f8adcfffd9 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -804,6 +804,7 @@ static void kernel_restart_prepare(char *cmd)
804 blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd); 804 blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd);
805 system_state = SYSTEM_RESTART; 805 system_state = SYSTEM_RESTART;
806 device_shutdown(); 806 device_shutdown();
807 sysdev_shutdown();
807} 808}
808 809
809/** 810/**
@@ -860,6 +861,7 @@ void kernel_shutdown_prepare(enum system_states state)
860void kernel_halt(void) 861void kernel_halt(void)
861{ 862{
862 kernel_shutdown_prepare(SYSTEM_HALT); 863 kernel_shutdown_prepare(SYSTEM_HALT);
864 sysdev_shutdown();
863 printk(KERN_EMERG "System halted.\n"); 865 printk(KERN_EMERG "System halted.\n");
864 machine_halt(); 866 machine_halt();
865} 867}
@@ -876,6 +878,7 @@ void kernel_power_off(void)
876 kernel_shutdown_prepare(SYSTEM_POWER_OFF); 878 kernel_shutdown_prepare(SYSTEM_POWER_OFF);
877 if (pm_power_off_prepare) 879 if (pm_power_off_prepare)
878 pm_power_off_prepare(); 880 pm_power_off_prepare();
881 sysdev_shutdown();
879 printk(KERN_EMERG "Power down.\n"); 882 printk(KERN_EMERG "Power down.\n");
880 machine_power_off(); 883 machine_power_off();
881} 884}