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);