Merge branch 'linus' into sched/urgent

[linux-2.6] / kernel / power / disk.c

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 859a8e59773a3a1822bf68700aac39600ff9a60f..14a656cdc6523bf64d9c5b64c3a628529b56bab5 100644 (file)
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -391,7 +391,7 @@ int hibernation_platform_enter(void)
                goto Close;
 
        suspend_console();
-       error = device_suspend(PMSG_SUSPEND);
+       error = device_suspend(PMSG_HIBERNATE);
        if (error)
                goto Resume_console;
 
@@ -404,7 +404,7 @@ int hibernation_platform_enter(void)
                goto Finish;
 
        local_irq_disable();
-       error = device_power_down(PMSG_SUSPEND);
+       error = device_power_down(PMSG_HIBERNATE);
        if (!error) {
                hibernation_ops->enter();
                /* We should never get here */