projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
PM: Wait for console in resume
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
power
/
console.c
diff --git
a/kernel/power/console.c
b/kernel/power/console.c
index b8628be2a465c4841ccc69135d91618b56b2d6ca..a3961b205de743c30f9588e02d28f1f959b46db6 100644
(file)
--- 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