From 18c59982531370b42f201c7dd27171430b2f4971 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 16 May 2007 15:28:14 -0700
Subject: [PATCH] --- yaml --- r: 56468 b: refs/heads/master c:
 52ade9b3b97fd3bea42842a056fe0786c28d0555 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/power/main.c | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0bbbce2cfa34..59f8987c6b6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b104bcb8e460e45a1aebe3da9b86aacdb4cab12
+refs/heads/master: 52ade9b3b97fd3bea42842a056fe0786c28d0555
diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c
index 40d56a31245e..b98b80ccf437 100644
--- a/trunk/kernel/power/main.c
+++ b/trunk/kernel/power/main.c
@@ -97,25 +97,26 @@ static int suspend_prepare(suspend_state_t state)
 		}
 	}
 
-	if (pm_ops->prepare) {
-		if ((error = pm_ops->prepare(state)))
-			goto Thaw;
-	}
-
 	suspend_console();
 	error = device_suspend(PMSG_SUSPEND);
 	if (error) {
 		printk(KERN_ERR "Some devices failed to suspend\n");
-		goto Resume_devices;
+		goto Resume_console;
 	}
+	if (pm_ops->prepare) {
+		if ((error = pm_ops->prepare(state)))
+			goto Resume_devices;
+	}
+
 	error = disable_nonboot_cpus();
 	if (!error)
 		return 0;
 
 	enable_nonboot_cpus();
- Resume_devices:
 	pm_finish(state);
+ Resume_devices:
 	device_resume();
+ Resume_console:
 	resume_console();
  Thaw:
 	thaw_processes();