diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-12-06 20:34:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 08:39:28 -0800 |
| commit | 2d87595ea628ea58415ba4638c553a8c2fbd90e2 (patch) | |
| tree | 5e9a94416c45d9b1c6360fd1c87d9d72968af67b /kernel | |
| parent | 06df6a5c181f462c71ddcc20ff6c7ea0bec18ec8 (diff) | |
| download | blackbird-obmc-linux-2d87595ea628ea58415ba4638c553a8c2fbd90e2.tar.gz blackbird-obmc-linux-2d87595ea628ea58415ba4638c553a8c2fbd90e2.zip | |
[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')
| -rw-r--r-- | kernel/power/disk.c | 2 |
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) return error; if (pm_disk_mode == PM_DISK_TESTPROC) - goto Thaw; + return 0; suspend_console(); error = device_suspend(PMSG_FREEZE); |
