From a360cbebc783f710fb21cc0dcbc3c796ff316308 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Wed, 6 Dec 2006 20:34:47 -0800
Subject: [PATCH] --- yaml --- r: 42733 b: refs/heads/master c:
 2d87595ea628ea58415ba4638c553a8c2fbd90e2 h: refs/heads/master i:   42731:
 1c12573c891acaa6c9a2e0c421bc3714416b0e21 v: v3

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

diff --git a/[refs] b/[refs]
index 7fedec78198d..2c1dd9b844e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06df6a5c181f462c71ddcc20ff6c7ea0bec18ec8
+refs/heads/master: 2d87595ea628ea58415ba4638c553a8c2fbd90e2
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index 126dda61f45d..6180379d5b84 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -151,7 +151,7 @@ int pm_suspend_disk(void)
 		return error;
 
 	if (pm_disk_mode == PM_DISK_TESTPROC)
-		goto Thaw;
+		return 0;
 
 	suspend_console();
 	error = device_suspend(PMSG_FREEZE);