Merge branch 'linux-2.6'

[linux-2.6-omap-h63xx.git] / kernel / power / main.c

diff --git a/kernel/power/main.c b/kernel/power/main.c
index e47214cfeb2d43a4d8c044e9b7b82b24cec20c97..6a6d5eb3524e7d2f219aeaa894e70981b3a706fb 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -175,12 +175,12 @@ static int suspend_prepare(void)
        if (!suspend_ops || !suspend_ops->enter)
                return -EPERM;
 
+       pm_prepare_console();
+
        error = pm_notifier_call_chain(PM_SUSPEND_PREPARE);
        if (error)
                goto Finish;
 
-       pm_prepare_console();
-
        if (suspend_freeze_processes()) {
                error = -EAGAIN;
                goto Thaw;
@@ -200,9 +200,9 @@ static int suspend_prepare(void)
 
  Thaw:
        suspend_thaw_processes();
-       pm_restore_console();
  Finish:
        pm_notifier_call_chain(PM_POST_SUSPEND);
+       pm_restore_console();
        return error;
 }
 
@@ -309,8 +309,8 @@ int suspend_devices_and_enter(suspend_state_t state)
 static void suspend_finish(void)
 {
        suspend_thaw_processes();
-       pm_restore_console();
        pm_notifier_call_chain(PM_POST_SUSPEND);
+       pm_restore_console();
 }