Signed-off-by: Max Staudt <mstaudt@xxxxxxx> Reviewed-by: Oliver Neukum <oneukum@xxxxxxxx> --- drivers/video/fbdev/core/fbcon.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 4ac1a33be418..cbe8a4480037 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1333,6 +1333,15 @@ static void fbcon_cursor(struct vc_data *vc, int mode) int y; int c = scr_readw((u16 *) vc->vc_pos); + /* Disable the splash here so we don't have to hook into + * vt_console_print() in drivers/tty/vt/vt.c + * + * We'd disable the splash just before the call to + * hide_cursor() anyway, so this spot is just fine. + */ + if (oops_in_progress) + bootsplash_disable(); + ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms); if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1) -- 2.12.3 -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
