-stable review patch. If anyone has any objections, please let us know. ------------------ From: Rafael J Wysocki The 'testproc' swsusp debug mode thaws tasks twice in a row, which is _very_ confusing. Fix that. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Cc: Signed-off-by: Andrew Morton Signed-off-by: Chris Wright --- 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); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/