Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/video/console/fbcon.c

+2 −0
Original line number Diff line number Diff line
@@ -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);