Avoids later waking up to a blinking cursor if the devicewoke up and returned to sleep before the console switch happened. Signed-off-by: Brian Swetland <swetland@xxxxxxxxxx>Signed-off-by: Arve Hjønnevåg <arve@xxxxxxxxxxx>--- kernel/power/console.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/kernel/power/console.c b/kernel/power/console.cindex b8628be..a3961b2 100644--- a/kernel/power/console.c+++ b/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-- 1.6.1 _______________________________________________linux-pm mailing listlinux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx://lists.linux-foundation.org/mailman/listinfo/linux-pm