From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Thu, 7 Dec 2006 04:34:47 +0000 (-0800)
Subject: [PATCH] PM: Fix swsusp debug mode testproc
X-Git-Tag: v2.6.20-rc1~145^2^2~266
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d87595ea628ea58415ba4638c553a8c2fbd90e2;p=linux-2.6

[PATCH] PM: Fix swsusp debug mode testproc

The 'testproc' swsusp debug mode thaws tasks twice in a row, which is _very_
confusing.  Fix that.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 126dda61f4..6180379d5b 100644
--- a/kernel/power/disk.c
+++ b/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);