From 97161a4c79dbde565f918a946f1ae13f8c9abff8 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Wed, 1 Jul 2009 11:13:07 +0900
Subject: [PATCH] --- yaml --- r: 155047 b: refs/heads/master c:
 febe04de3be4bf66f9339d8847db2806d99fd164 h: refs/heads/master i:   155045:
 9eff4533e7767185d106870801c2006ad4c16990   155043:
 0f05e2b01e7318df9d938fd15ed4576760cce74d   155039:
 1d47715a8319938190db5004c407eadd0d0e5c40 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/boot/video-bios.c | 3 +--
 trunk/arch/x86/boot/video-vesa.c | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dad830f49862..6349f7b80725 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22a26e6663008e1fc4d1467aaff7e775124bce31
+refs/heads/master: febe04de3be4bf66f9339d8847db2806d99fd164
diff --git a/trunk/arch/x86/boot/video-bios.c b/trunk/arch/x86/boot/video-bios.c
index d660be492363..49e0c18833e0 100644
--- a/trunk/arch/x86/boot/video-bios.c
+++ b/trunk/arch/x86/boot/video-bios.c
@@ -37,14 +37,13 @@ static int set_bios_mode(u8 mode)
 	ireg.al = mode;		/* AH=0x00 Set Video Mode */
 	intcall(0x10, &ireg, NULL);
 
-
 	ireg.ah = 0x0f;		/* Get Current Video Mode */
 	intcall(0x10, &ireg, &oreg);
 
 	do_restore = 1;		/* Assume video contents were lost */
 
 	/* Not all BIOSes are clean with the top bit */
-	new_mode = ireg.al & 0x7f;
+	new_mode = oreg.al & 0x7f;
 
 	if (new_mode == mode)
 		return 0;	/* Mode change OK */
diff --git a/trunk/arch/x86/boot/video-vesa.c b/trunk/arch/x86/boot/video-vesa.c
index c700147d6ffb..275dd177f198 100644
--- a/trunk/arch/x86/boot/video-vesa.c
+++ b/trunk/arch/x86/boot/video-vesa.c
@@ -45,7 +45,7 @@ static int vesa_probe(void)
 	ireg.di = (size_t)&vginfo;
 	intcall(0x10, &ireg, &oreg);
 
-	if (ireg.ax != 0x004f ||
+	if (oreg.ax != 0x004f ||
 	    vginfo.signature != VESA_MAGIC ||
 	    vginfo.version < 0x0102)
 		return 0;	/* Not present */
@@ -70,7 +70,7 @@ static int vesa_probe(void)
 		ireg.di = (size_t)&vminfo;
 		intcall(0x10, &ireg, &oreg);
 
-		if (ireg.ax != 0x004f)
+		if (oreg.ax != 0x004f)
 			continue;
 
 		if ((vminfo.mode_attr & 0x15) == 0x05) {