diff options
| author | Scot Doyle <lkml14@scotdoyle.com> | 2015-10-09 15:08:10 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-11-09 14:37:36 -0800 |
| commit | 9dd5c1324e679ca886861aad80f079a540841212 (patch) | |
| tree | b11489576928ba5865d578fec00a5e1e38a083f6 | |
| parent | cf411ffe50103f1b680abaf2ab3339618ec86d56 (diff) | |
| download | linux-9dd5c1324e679ca886861aad80f079a540841212.tar.gz linux-9dd5c1324e679ca886861aad80f079a540841212.tar.bz2 linux-9dd5c1324e679ca886861aad80f079a540841212.zip | |
fbcon: initialize blink interval before calling fb_set_par
commit f235f664a8afabccf863a5dee4777d2d7b676fda upstream.
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 <alistair@popple.id.au>
Signed-off-by: Scot Doyle <lkml14@scotdoyle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/video/console/fbcon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 1aaf89300621..92f394927f24 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); |