diff options
Diffstat (limited to 'drivers/char/vt.c')
-rw-r--r-- | drivers/char/vt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 45b33cf97643..edb7002a3216 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
@@ -3506,9 +3506,6 @@ void do_blank_screen(int entering_gfx) | |||
3506 | } | 3506 | } |
3507 | return; | 3507 | return; |
3508 | } | 3508 | } |
3509 | if (blank_state != blank_normal_wait) | ||
3510 | return; | ||
3511 | blank_state = blank_off; | ||
3512 | 3509 | ||
3513 | /* entering graphics mode? */ | 3510 | /* entering graphics mode? */ |
3514 | if (entering_gfx) { | 3511 | if (entering_gfx) { |
@@ -3516,10 +3513,15 @@ void do_blank_screen(int entering_gfx) | |||
3516 | save_screen(vc); | 3513 | save_screen(vc); |
3517 | vc->vc_sw->con_blank(vc, -1, 1); | 3514 | vc->vc_sw->con_blank(vc, -1, 1); |
3518 | console_blanked = fg_console + 1; | 3515 | console_blanked = fg_console + 1; |
3516 | blank_state = blank_off; | ||
3519 | set_origin(vc); | 3517 | set_origin(vc); |
3520 | return; | 3518 | return; |
3521 | } | 3519 | } |
3522 | 3520 | ||
3521 | if (blank_state != blank_normal_wait) | ||
3522 | return; | ||
3523 | blank_state = blank_off; | ||
3524 | |||
3523 | /* don't blank graphics */ | 3525 | /* don't blank graphics */ |
3524 | if (vc->vc_mode != KD_TEXT) { | 3526 | if (vc->vc_mode != KD_TEXT) { |
3525 | console_blanked = fg_console + 1; | 3527 | console_blanked = fg_console + 1; |