From e211877f6f4d90647671b05d0d8a603f4c75781c Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Fri, 3 Oct 2008 10:22:33 -0700 Subject: [PATCH] --- yaml --- r: 113382 b: refs/heads/master c: 98920dc3d1113b883cbc73e3293446d3525c6042 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/boot/edd.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0c815a236279..375118d50bb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cdcdb99cf7c2e1835fc5b471864d21161c3e679 +refs/heads/master: 98920dc3d1113b883cbc73e3293446d3525c6042 diff --git a/trunk/arch/x86/boot/edd.c b/trunk/arch/x86/boot/edd.c index 067e28cd3c5f..1aae8f3e5ca1 100644 --- a/trunk/arch/x86/boot/edd.c +++ b/trunk/arch/x86/boot/edd.c @@ -32,9 +32,7 @@ static int read_mbr(u8 devno, void *buf) : "+a" (ax), "+c" (cx), "+d" (dx), "+b" (bx) : : "esi", "edi", "memory"); - /* 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 */ + return -(u8)ax; /* 0 or -1 */ } static u32 read_mbr_sig(u8 devno, struct edd_info *ei, u32 *mbrsig)