summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J Wysocki <rjw@sisk.pl>2006-12-06 20:34:47 -0800
committerChris Wright <chrisw@sous-sol.org>2006-12-11 11:32:40 -0800
commit1f583f6270cd7d3130b8a3b08cfef01534d588fe (patch)
treecc9af398e88c0071925e5b480fa508407ec98412
parent1157f82831d3745a61b897d9f8a38886c586d09f (diff)
[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: Chris Wright <chrisw@sous-sol.org>
-rw-r--r--kernel/power/disk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index b1fb7866b0b3..f8f04edf9ae9 100644
--- a/kernel/power/disk.c
+++ b/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);