From 8ece3dccfcb74f4956400135bbc29535db916df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
Date: Sat, 14 Feb 2009 02:06:17 +0100
Subject: [PATCH] --- yaml --- r: 131655 b: refs/heads/master c:
 b090f9fa53d51c8a33370071de9e391919ee1fa7 h: refs/heads/master i:   131653:
 d36590a6cc30439d80d798394fb9c46b06662cbd   131651:
 171c7fb2f2f92f562ee414cac511403bf09d7733   131647:
 ebcbb9e421d74535931391aef5133dbf91915cf9 v: v3

---
 [refs]                       | 2 +-
 trunk/kernel/power/console.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4eadd7bd7c20..8576036134b4 100644
--- 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
index b8628be2a465..a3961b205de7 100644
--- 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