From 98920dc3d1113b883cbc73e3293446d3525c6042 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 3 Oct 2008 10:22:33 -0700
Subject: [PATCH] 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>
---
 arch/x86/boot/edd.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/boot/edd.c b/arch/x86/boot/edd.c
index 067e28cd3c5f..1aae8f3e5ca1 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)
-- 
2.30.9