aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/console
diff options
context:
space:
mode:
authorMichal Januszewski <spock@gentoo.org>2007-05-08 03:38:07 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:28 -0400
commitd1e2306681ad3cbbe63a2bfcc37ac22a21b0f0eb (patch)
tree40bc6df28d932d9873df786613d8254f545b8661 /drivers/video/console
parent31990a9d2ed02cb7552e05bb8a99872df9fd04da (diff)
fbcon: don't draw cursor when it's disabled
When the cursor and echo are disabled on the current console, pressing a key will cause a black rectangle to be painted in the cursor's position. Fix this by not touching the framebuffer in fbcon_cursor() when the cursor is off. Signed-off-by: Michal Januszewski <spock@gentoo.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/console')
-rw-r--r--drivers/video/console/fbcon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index bd131d472e24..f1e3e3c00b21 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1310,7 +1310,7 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
1310 int y; 1310 int y;
1311 int c = scr_readw((u16 *) vc->vc_pos); 1311 int c = scr_readw((u16 *) vc->vc_pos);
1312 1312
1313 if (fbcon_is_inactive(vc, info)) 1313 if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)
1314 return; 1314 return;
1315 1315
1316 ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1; 1316 ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1;