projects/linux·commit f235f664

fbcon: initialize blink interval before calling fb_set_par

f235f664 · Scot Doyle <[email protected]> · 2015-10-09 15:08:10 +00:00

Since commit 27a4c827c34ac4256a190cc9d24607f953c1c459
    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: Alistair Popple <[email protected]>
Signed-off-by: Scot Doyle <[email protected]>
Cc: <[email protected]> [v4.2]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Commit
f235f664a8afabccf863a5dee4777d2d7b676fda
Parents
f967fc8f

Changes

1 files changed · +1 −0

FileStatusAddDelContent
drivers/video/console/fbcon.cmodified+1−0View file

drivers/video/console/fbcon.c

View file
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 1aaf893..92f3949 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -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);