Commit:     d1e2306681ad3cbbe63a2bfcc37ac22a21b0f0eb
Parent:     31990a9d2ed02cb7552e05bb8a99872df9fd04da
Author:     Michal Januszewski <[EMAIL PROTECTED]>
AuthorDate: Tue May 8 00:38:07 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue May 8 11:15:28 2007 -0700

    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 <[EMAIL PROTECTED]>
    Cc: "Antonino A. Daplas" <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/video/console/fbcon.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index bd131d4..f1e3e3c 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)
        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)
        ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to