From: Pavel Machek <pavel@ucw.cz>
Do not call device_shutdown with interrupts disabled. It is wrong and
produces ugly warnings.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
kernel/power/disk.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff -puN kernel/power/disk.c~call-device_shutdown-with-interrupts-enabled kernel/power/disk.c
--- devel/kernel/power/disk.c~call-device_shutdown-with-interrupts-enabled 2005-07-08 23:11:23.000000000 -0700
+++ devel-akpm/kernel/power/disk.c 2005-07-08 23:11:23.000000000 -0700
@@ -52,19 +52,21 @@ static void power_down(suspend_disk_meth
unsigned long flags;
int error = 0;
- local_irq_save(flags);
switch(mode) {
case PM_DISK_PLATFORM:
- device_shutdown();
+ device_shutdown();
+ local_irq_save(flags);
error = pm_ops->enter(PM_SUSPEND_DISK);
break;
case PM_DISK_SHUTDOWN:
printk("Powering off system\n");
device_shutdown();
+ local_irq_save(flags);
machine_power_off();
break;
case PM_DISK_REBOOT:
device_shutdown();
+ local_irq_save(flags);
machine_restart(NULL);
break;
}
_