Commit 215b031b authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'fbdev-fixes-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

Pull fbdev fix from Tomi Valkeinen:
 "Fix hang caused by fbconsole blink timer"

* tag 'fbdev-fixes-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  fbcon: set a default value to blink interval
parents f983cd32 a1e533ec
...@@ -709,6 +709,7 @@ static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info, ...@@ -709,6 +709,7 @@ static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info,
} }
if (!err) { if (!err) {
ops->cur_blink_jiffies = HZ / 5;
info->fbcon_par = ops; info->fbcon_par = ops;
if (vc) if (vc)
...@@ -956,6 +957,7 @@ static const char *fbcon_startup(void) ...@@ -956,6 +957,7 @@ static const char *fbcon_startup(void)
ops->currcon = -1; ops->currcon = -1;
ops->graphics = 1; ops->graphics = 1;
ops->cur_rotate = -1; ops->cur_rotate = -1;
ops->cur_blink_jiffies = HZ / 5;
info->fbcon_par = ops; info->fbcon_par = ops;
p->con_rotate = initial_rotation; p->con_rotate = initial_rotation;
set_blitting_type(vc, info); set_blitting_type(vc, info);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment