Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54897
b: refs/heads/master
c: d1e2306
h: refs/heads/master
i:
  54895: 0c21d8e
v: v3
  • Loading branch information
Michal Januszewski authored and Linus Torvalds committed May 8, 2007
1 parent 586b2c8 commit 88a13a6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 31990a9d2ed02cb7552e05bb8a99872df9fd04da
refs/heads/master: d1e2306681ad3cbbe63a2bfcc37ac22a21b0f0eb
2 changes: 1 addition & 1 deletion trunk/drivers/video/console/fbcon.c
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,7 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
int y;
int c = scr_readw((u16 *) vc->vc_pos);

if (fbcon_is_inactive(vc, info))
if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)
return;

ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1;
Expand Down

0 comments on commit 88a13a6

Please sign in to comment.