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

Commit f235f664 authored by Scot Doyle's avatar Scot Doyle Committed by Greg Kroah-Hartman
Browse files

fbcon: initialize blink interval before calling fb_set_par 



Since commit 27a4c827
    fbcon: use the cursor blink interval provided by vt

a PPC64LE kernel fails to boot when fbcon_add_cursor_timer uses an
uninitialized ops->cur_blink_jiffies. Prevent by initializing
in fbcon_init before the call to info->fbops->fb_set_par.

Reported-and-tested-by: default avatarAlistair Popple <alistair@popple.id.au>
Signed-off-by: default avatarScot Doyle <lkml14@scotdoyle.com>
Cc: <stable@vger.kernel.org> [v4.2]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f967fc8f

drivers/video/console/fbcon.c

+1 −0
Original line number Diff line number Diff line
@@ -1093,6 +1093,7 @@ static void fbcon_init(struct vc_data *vc, int init) 
		con_copy_unimap(vc, svc);



	ops = info->fbcon_par;

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

	p->con_rotate = initial_rotation;

	set_blitting_type(vc, info);