diff options
| author | Linus Torvalds | 2016-03-03 10:46:18 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2016-03-03 10:46:18 -0800 |
| commit | 215b031b970a6cec729dcfaa94537074256ba2e8 (patch) | |
| tree | a79e414ea703174d5f300aa498dfdc81631a3a3a | |
| parent | f983cd32cd5d2ec47ac8868f387bad15e8f11f85 (diff) | |
| parent | a1e533ec07d583d01349ef13c0c965b8633e1b91 (diff) | |
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
| -rw-r--r-- | drivers/video/console/fbcon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 92f394927f24..6e92917ba77a 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -709,6 +709,7 @@ static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info, } if (!err) { + ops->cur_blink_jiffies = HZ / 5; info->fbcon_par = ops; if (vc) @@ -956,6 +957,7 @@ static const char *fbcon_startup(void) ops->currcon = -1; ops->graphics = 1; ops->cur_rotate = -1; + ops->cur_blink_jiffies = HZ / 5; info->fbcon_par = ops; p->con_rotate = initial_rotation; set_blitting_type(vc, info); |