projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[cascardo/linux.git]
/
kernel
/
power
/
console.c
diff --git
a/kernel/power/console.c
b/kernel/power/console.c
index
b8628be
..
a3961b2
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