---

yaml --- r: 131655 b: refs/heads/master c: b090f9f h: refs/heads/master i: 131653: d36590a 131651: 171c7fb 131647: ebcbb9e v: v3
git-mirror · Feb 21, 2009 · 8ece3dc · 8ece3dc
1 parent 23aa42b
commit 8ece3dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebae2604f2c3693717d9dc687c84578f0526480c
+refs/heads/master: b090f9fa53d51c8a33370071de9e391919ee1fa7
diff --git a/trunk/kernel/power/console.c b/trunk/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