---

yaml --- r: 164887 b: refs/heads/master c: f0c7d2b h: refs/heads/master i: 164885: fe578a7 164883: 3c04654 164879: e4a53f6 v: v3
git-mirror · Sep 23, 2009 · 64f4932 · 64f4932
1 parent 5ce2560
commit 64f4932
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ddce3fd0acbdc1be684fb5f919ae3d2e9518aac
+refs/heads/master: f0c7d2b72ad1a694c0c886a14cc708841181e9bd
diff --git a/trunk/drivers/video/console/vgacon.c b/trunk/drivers/video/console/vgacon.c
@@ -589,12 +589,14 @@ static void vgacon_init(struct vc_data *c, int init)
 
 static void vgacon_deinit(struct vc_data *c)
 {
-	/* When closing the last console, reset video origin */
-	if (!--vgacon_uni_pagedir[1]) {
+	/* When closing the active console, reset video origin */
+	if (CON_IS_VISIBLE(c)) {
 		c->vc_visible_origin = vga_vram_base;
 		vga_set_mem_top(c);
-		con_free_unimap(c);
 	}
+
+	if (!--vgacon_uni_pagedir[1])
+		con_free_unimap(c);
 	c->vc_uni_pagedir_loc = &c->vc_uni_pagedir;
 	con_set_default_unimap(c);
 }