From 16b9846ab01fa1a113fe156bb381a03469639d39 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Thu, 19 Jul 2007 01:47:31 -0700
Subject: [PATCH] --- yaml --- r: 61543 b: refs/heads/master c:
 b1457bcc3a00a0446c7f6e2f22fd24b6d8d0a309 h: refs/heads/master i:   61541:
 5a73c97ead70b616659260946c1d679c03b93818   61539:
 64a81ed40c830ae78e56518957d219180cc5d461   61535:
 8fe5d1eace4ba3347471d6da58aa7c95e4f3b31f v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/power/disk.c | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f19a05c6f3f8..f91e9b88a573 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10a1803d667e209914eaada9b95525252f23ec78
+refs/heads/master: b1457bcc3a00a0446c7f6e2f22fd24b6d8d0a309
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index 77ac605bf20a..885c653509c9 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -205,12 +205,23 @@ int hibernation_restore(int platform_mode)
 
 int hibernation_platform_enter(void)
 {
+	int error;
+
 	if (hibernation_ops) {
 		kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
-		return hibernation_ops->enter();
+		/*
+		 * We have cancelled the power transition by running
+		 * hibernation_ops->finish() before saving the image, so we
+		 * should let the firmware know that we're going to enter the
+		 * sleep state after all
+		 */
+		error = hibernation_ops->prepare();
+		if (!error)
+			error = hibernation_ops->enter();
 	} else {
-		return -ENOSYS;
+		error = -ENOSYS;
 	}
+	return error;
 }
 
 /**