summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-10-03 10:22:33 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-10-03 10:22:33 -0700
commit98920dc3d1113b883cbc73e3293446d3525c6042 (patch)
treea8f9dbd93507b97520c64b82b524a879f7e8a6d5 /arch/x86/boot
parent6cdcdb99cf7c2e1835fc5b471864d21161c3e679 (diff)
downloadop-kernel-dev-98920dc3d1113b883cbc73e3293446d3525c6042.zip
op-kernel-dev-98920dc3d1113b883cbc73e3293446d3525c6042.tar.gz
Revert "x86: fix ghost EDD devices in /sys again"
This reverts commit 464f04c9e9b3b1c4f5ffb89c51d8ba2a2034c846. Obsoleted by commit 6cdcdb99cf7c2e1835fc5b471864d21161c3e679. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/edd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/boot/edd.c b/arch/x86/boot/edd.c
index 067e28c..1aae8f3 100644
--- a/arch/x86/boot/edd.c
+++ b/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)
OpenPOWER on IntegriCloud