From 60ce215e2819798d133bd0d898b98e0ac4372cb5 Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Tue, 8 May 2007 00:40:06 -0700 Subject: [PATCH] --- yaml --- r: 54967 b: refs/heads/master c: 2ae854777592856ad8ce4d4cdb6114804e2e28f6 h: refs/heads/master i: 54965: e65f99f3efba1b0354cfc5212814e323cc61a69e 54963: 731cc40d908f86a85934d7f6eced04fb41c02a19 54959: 31da0de87053f119e2398f5aae24d20565ddc6fd v: v3 --- [refs] | 2 +- trunk/drivers/video/console/vgacon.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index caf4318e615c..d463557f7eb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32dd38030b3b4ca0aa18a5402059de27bf69ed6b +refs/heads/master: 2ae854777592856ad8ce4d4cdb6114804e2e28f6 diff --git a/trunk/drivers/video/console/vgacon.c b/trunk/drivers/video/console/vgacon.c index d0d2733ef479..2460b82a1d93 100644 --- a/trunk/drivers/video/console/vgacon.c +++ b/trunk/drivers/video/console/vgacon.c @@ -660,6 +660,9 @@ static void vgacon_set_cursor_size(int xpos, int from, int to) static void vgacon_cursor(struct vc_data *c, int mode) { + if (c->vc_mode != KD_TEXT) + return; + vgacon_restore_screen(c); switch (mode) { @@ -1318,7 +1321,7 @@ static int vgacon_scroll(struct vc_data *c, int t, int b, int dir, unsigned long oldo; unsigned int delta; - if (t || b != c->vc_rows || vga_is_gfx) + if (t || b != c->vc_rows || vga_is_gfx || c->vc_mode != KD_TEXT) return 0; if (!vga_hardscroll_enabled || lines >= c->vc_rows / 2)