[linux-pm] [PATCH 8/9] PM: Wait for console in resume
Rafael J. Wysocki
rjw at sisk.pl
Fri Feb 13 17:06:17 PST 2009
From: Arve Hjønnevåg <arve at android.com>
Avoids later waking up to a blinking cursor if the device woke up and
returned to sleep before the console switch happened.
Signed-off-by: Brian Swetland <swetland at google.com>
Signed-off-by: Arve Hjønnevåg <arve at android.com>
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
---
kernel/power/console.c | 6 ++++++
1 file changed, 6 insertions(+)
Index: linux-2.6/kernel/power/console.c
===================================================================
--- linux-2.6.orig/kernel/power/console.c
+++ linux-2.6/kernel/power/console.c
@@ -78,6 +78,12 @@ void pm_restore_console(void)
}
set_console(orig_fgconsole);
release_console_sem();
+
+ if (vt_waitactive(orig_fgconsole)) {
+ pr_debug("Resume: Can't switch VCs.");
+ return;
+ }
+
kmsg_redirect = orig_kmsg;
}
#endif
More information about the linux-pm
mailing list