| From stable-bounces@linux.kernel.org Wed Dec 6 20:40:11 2006 |
| Message-Id: <200612070434.kB74YlSL029177@shell0.pdx.osdl.net> |
| To: torvalds@osdl.org |
| From: akpm@osdl.org |
| Date: Wed, 06 Dec 2006 20:34:47 -0800 |
| Cc: akpm@osdl.org, rjw@sisk.pl, stable@kernel.org, pavel@ucw.cz |
| Subject: PM: Fix swsusp debug mode testproc |
| |
| 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); |
