aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/disk.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2006-12-06 23:34:47 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 11:39:28 -0500
commit2d87595ea628ea58415ba4638c553a8c2fbd90e2 (patch)
tree5e9a94416c45d9b1c6360fd1c87d9d72968af67b /kernel/power/disk.c
parent06df6a5c181f462c71ddcc20ff6c7ea0bec18ec8 (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: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power/disk.c')
-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 126dda61f45d..6180379d5b84 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -151,7 +151,7 @@ int pm_suspend_disk(void)
151 return error; 151 return error;
152 152
153 if (pm_disk_mode == PM_DISK_TESTPROC) 153 if (pm_disk_mode == PM_DISK_TESTPROC)
154 goto Thaw; 154 return 0;
155 155
156 suspend_console(); 156 suspend_console();
157 error = device_suspend(PMSG_FREEZE); 157 error = device_suspend(PMSG_FREEZE);