[patch 27/32] PM: Fix swsusp debug mode testproc

Chris Wright
2006-12-09T00:02:02Z

[-- Attachment #1: pm-fix-swsusp-debug-mode-testproc.patch --]
[-- Type: text/plain, Size: 796 bytes --]

-stable review patch. If anyone has any objections, please let us know.
------------------

From: Rafael J Wysocki <rjw@sisk.pl>

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: Chris Wright <chrisw@sous-sol.org>
---

kernel/power/disk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.19.orig/kernel/power/disk.c
+++ linux-2.6.19/kernel/power/disk.c
@@ -127,7 +127,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);

--