2 files changed, 7 insertions, 9 deletions

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index c6dee739080c..72baaf011fb7 100644
--- a/kernel/power/hibernate.c
+++ b/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/kernel/power/user.c b/kernel/power/user.c
index 7bee91f9af51..33c4329205af 100644
--- a/kernel/power/user.c
+++ b/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;