---

yaml --- r: 54967 b: refs/heads/master c: 2ae8547 h: refs/heads/master i: 54965: e65f99f 54963: 731cc40 54959: 31da0de v: v3
git-mirror · May 8, 2007 · 60ce215 · 60ce215
1 parent 895fd5e
commit 60ce215
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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)