Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a17d7e8 authored by Scot Doyle's avatar Scot Doyle Committed by Tomi Valkeinen
Browse files

fbcon: unconditionally initialize cursor blink interval 



A sun7i-a20-olinuxino-micro fails to boot when kernel parameter
vt.global_cursor_default=0. The value is copied to vc->vc_deccm
causing the initialization of ops->cur_blink_jiffies to be skipped.
Unconditionally initialize it.

Reported-and-tested-by: default avatarJonathan Liu <net147@gmail.com>
Signed-off-by: default avatarScot Doyle <lkml14@scotdoyle.com>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 37b617f9

drivers/video/console/fbcon.c

+2 −1
Original line number Diff line number Diff line
@@ -1306,10 +1306,11 @@ static void fbcon_cursor(struct vc_data *vc, int mode) 
	int y;

 	int c = scr_readw((u16 *) vc->vc_pos);



	ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);



	if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)

		return;



	ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);

	if (vc->vc_cursor_type & 0x10)

		fbcon_del_cursor_timer(info);

	else