X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fpower%2Fconsole.c;h=a3961b205de743c30f9588e02d28f1f959b46db6;hb=dc52b5bf2c94828fd3c8d26f4ca810d4ba53999a;hp=b8628be2a465c4841ccc69135d91618b56b2d6ca;hpb=9781db7b345b5dfe93787aaaf310c861db7c1ede;p=linux-2.6-omap-h63xx.git

diff --git a/kernel/power/console.c b/kernel/power/console.c
index b8628be2a46..a3961b205de 100644
--- 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