diff options
| author |   Scot Doyle <lkml14@scotdoyle.com> | 2015-10-09 15:08:10 +0000 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-17 22:00:39 -0700 |
| commit | f235f664a8afabccf863a5dee4777d2d7b676fda (patch) | |
| tree | cd185b89595a7f325b136c5b28a10edd82158e56 /drivers/video/console/fbcon.c | |
| parent | Revert "serial: 8250_dma: don't bother DMA with small transfers" (diff) | |
| download | linux-dev-f235f664a8afabccf863a5dee4777d2d7b676fda.tar.xz linux-dev-f235f664a8afabccf863a5dee4777d2d7b676fda.zip | |
fbcon: initialize blink interval before calling fb_set_par
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>
Cc: <stable@vger.kernel.org> [v4.2]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/console/fbcon.c')
| -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); |