Commit b090f9fa authored by Arve Hjønnevåg's avatar Arve Hjønnevåg Committed by Linus Torvalds

PM: Wait for console in resume

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: default avatarBrian Swetland <swetland@google.com>
Signed-off-by: default avatarArve Hjønnevåg <arve@android.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ebae2604
...@@ -78,6 +78,12 @@ void pm_restore_console(void) ...@@ -78,6 +78,12 @@ void pm_restore_console(void)
} }
set_console(orig_fgconsole); set_console(orig_fgconsole);
release_console_sem(); release_console_sem();
if (vt_waitactive(orig_fgconsole)) {
pr_debug("Resume: Can't switch VCs.");
return;
}
kmsg_redirect = orig_kmsg; kmsg_redirect = orig_kmsg;
} }
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment