diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-04 18:16:39 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-04 18:16:39 +0200 |
| commit | 04782ca20a8ebb5acf0c35756a38964ae5ea7321 (patch) | |
| tree | ebf475793bb17444d3a1e21974617f27e8ff3a4b /drivers/video/console/fbcon.c | |
| parent | regmap: Support bulk reads for devices without raw formatting (diff) | |
| parent | regmap: fix a NULL pointer dereference in __regmap_init (diff) | |
| download | linux-04782ca20a8ebb5acf0c35756a38964ae5ea7321.tar.xz linux-04782ca20a8ebb5acf0c35756a38964ae5ea7321.zip | |
Merge branch 'topic/smbus-block' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-core
Diffstat (limited to 'drivers/video/console/fbcon.c')
| -rw-r--r-- | drivers/video/console/fbcon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 658c34bb9076..1aaf89300621 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -1306,10 +1306,11 @@ static void fbcon_cursor(struct vc_data *vc, int mode) int y; int c = scr_readw((u16 *) vc->vc_pos); + ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms); + if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1) return; - ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms); if (vc->vc_cursor_type & 0x10) fbcon_del_cursor_timer(info); else |