---

yaml --- r: 113380 b: refs/heads/master c: 464f04c h: refs/heads/master v: v3
git-mirror · Sep 6, 2008 · 00e354e · 00e354e
1 parent ede3109
commit 00e354e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2f37384fc9957ad0162d5285a5660f0a86ef243
+refs/heads/master: 464f04c9e9b3b1c4f5ffb89c51d8ba2a2034c846
diff --git a/trunk/arch/x86/boot/edd.c b/trunk/arch/x86/boot/edd.c
@@ -32,7 +32,9 @@ static int read_mbr(u8 devno, void *buf)
 		     : "+a" (ax), "+c" (cx), "+d" (dx), "+b" (bx)
 		     : : "esi", "edi", "memory");
 
-	return -(u8)ax;		/* 0 or -1 */
+	/* Some BIOSes do not set carry flag on error but still return
+	 * error in AH. The condition below is expected to catch both */
+	return -!!ax;		/* 0 or -1 */
 }
 
 static u32 read_mbr_sig(u8 devno, struct edd_info *ei, u32 *mbrsig)