X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fpower%2Fconsole.c;h=89bcf4973ee51cb8cc8028c6a3cf6a2272367b0a;hb=85b161a826f1954e9605deb3e6faa4be4d285a34;hp=623786d4415950b08c8fb6f3461bfb8c86c152b2;hpb=99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed;p=linux-2.6

diff --git a/kernel/power/console.c b/kernel/power/console.c
index 623786d441..89bcf4973e 100644
--- a/kernel/power/console.c
+++ b/kernel/power/console.c
@@ -27,7 +27,15 @@ int pm_prepare_console(void)
 		return 1;
 	}
 
-	set_console(SUSPEND_CONSOLE);
+	if (set_console(SUSPEND_CONSOLE)) {
+		/*
+		 * We're unable to switch to the SUSPEND_CONSOLE.
+		 * Let the calling function know so it can decide
+		 * what to do.
+		 */
+		release_console_sem();
+		return 1;
+	}
 	release_console_sem();
 
 	if (vt_waitactive(SUSPEND_CONSOLE)) {