From bc00c3248d1ecce3e08c8f51b154e79b03b10225 Mon Sep 17 00:00:00 2001
From: qiaochong <qiaochong@loongson.cn>
Date: Mon, 9 Aug 2010 17:21:23 -0700
Subject: [PATCH] --- yaml --- r: 207356 b: refs/heads/master c:
 02f0777a0d6560eb995aade34a1b82f95c0452da h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/char/vt.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8dfcebcf363f..731bbab27dee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8618a0e8a06f75c6efec2a5477861d704d48b28
+refs/heads/master: 02f0777a0d6560eb995aade34a1b82f95c0452da
diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c
index 4a9eb3044e52..cff1d4bce21d 100644
--- a/trunk/drivers/char/vt.c
+++ b/trunk/drivers/char/vt.c
@@ -3065,7 +3065,8 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
 
 		old_was_color = vc->vc_can_do_color;
 		vc->vc_sw->con_deinit(vc);
-		vc->vc_origin = (unsigned long)vc->vc_screenbuf;
+		if (!vc->vc_origin)
+			vc->vc_origin = (unsigned long)vc->vc_screenbuf;
 		visual_init(vc, i, 0);
 		set_origin(vc);
 		update_attr(vc);