From 9f93319636cc36a7cf923c432a8b835ce1d3c179 Mon Sep 17 00:00:00 2001
From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Date: Sat, 4 Feb 2012 23:39:56 +0100
Subject: [PATCH] --- yaml --- r: 291850 b: refs/heads/master c:
 a556d5b58345ccf51826b9ceac078072f830738b h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/kernel/power/hibernate.c | 10 +++++-----
 trunk/kernel/power/user.c      |  6 ++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index a2ebb59a68c7..16d7c4f45f69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51d6ff7acd920379f54d0be4dbe844a46178a65f
+refs/heads/master: a556d5b58345ccf51826b9ceac078072f830738b
diff --git a/trunk/kernel/power/hibernate.c b/trunk/kernel/power/hibernate.c
index c6dee739080c..72baaf011fb7 100644
--- a/trunk/kernel/power/hibernate.c
+++ b/trunk/kernel/power/hibernate.c
@@ -629,12 +629,8 @@ int hibernate(void)
 		goto Finish;
 
 	error = hibernation_snapshot(hibernation_mode == HIBERNATION_PLATFORM);
-	if (error)
-		goto Thaw;
-	if (freezer_test_done) {
-		freezer_test_done = false;
+	if (error || freezer_test_done)
 		goto Thaw;
-	}
 
 	if (in_suspend) {
 		unsigned int flags = 0;
@@ -659,6 +655,10 @@ int hibernate(void)
 
  Thaw:
 	thaw_processes();
+
+	/* Don't bother checking whether freezer_test_done is true */
+	freezer_test_done = false;
+
  Finish:
 	free_basic_memory_bitmaps();
 	usermodehelper_enable();
diff --git a/trunk/kernel/power/user.c b/trunk/kernel/power/user.c
index 7bee91f9af51..33c4329205af 100644
--- a/trunk/kernel/power/user.c
+++ b/trunk/kernel/power/user.c
@@ -251,10 +251,8 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
 		error = hibernation_snapshot(data->platform_support);
 		if (!error) {
 			error = put_user(in_suspend, (int __user *)arg);
-			if (!error && !freezer_test_done)
-				data->ready = 1;
-			if (freezer_test_done)
-				freezer_test_done = false;
+			data->ready = !freezer_test_done && !error;
+			freezer_test_done = false;
 		}
 		break;