From ca8f1dbf1f65dc40f3ce575ed90fd4a541e4b863 Mon Sep 17 00:00:00 2001
From: izumi <izumi2005@soft.fujitsu.com>
Date: Tue, 17 Jul 2007 04:05:49 -0700
Subject: [PATCH] --- yaml --- r: 60923 b: refs/heads/master c:
 b6e8f00fcd56b426371334d722d1f3fb251b7290 h: refs/heads/master i:   60921:
 e4d2ee03af1f2c4b7ffb1c1d55f288c6dc422c56   60919:
 a53ec9d533d9ccfcc846a003d2893eb77bf86662 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/char/vt.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e74e60b01aff..72025bb40711 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a3f28817e2a3f0be67ec8afa0cfd779adb5d41d
+refs/heads/master: b6e8f00fcd56b426371334d722d1f3fb251b7290
diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c
index 45b33cf97643..edb7002a3216 100644
--- a/trunk/drivers/char/vt.c
+++ b/trunk/drivers/char/vt.c
@@ -3506,9 +3506,6 @@ void do_blank_screen(int entering_gfx)
 		}
 		return;
 	}
-	if (blank_state != blank_normal_wait)
-		return;
-	blank_state = blank_off;
 
 	/* entering graphics mode? */
 	if (entering_gfx) {
@@ -3516,10 +3513,15 @@ void do_blank_screen(int entering_gfx)
 		save_screen(vc);
 		vc->vc_sw->con_blank(vc, -1, 1);
 		console_blanked = fg_console + 1;
+		blank_state = blank_off;
 		set_origin(vc);
 		return;
 	}
 
+	if (blank_state != blank_normal_wait)
+		return;
+	blank_state = blank_off;
+
 	/* don't blank graphics */
 	if (vc->vc_mode != KD_TEXT) {
 		console_blanked = fg_console + 1;