diff --git a/[refs] b/[refs]
index d23a229e1e6c..9210aa0191fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffaa152efd02849c0c36947f533f2ee3ee55369a
+refs/heads/master: f2ba93929fdb91fd806be20e959a50f7db82790e
diff --git a/trunk/arch/x86/boot/edd.c b/trunk/arch/x86/boot/edd.c
index 03399d64013b..d93cbc6464d0 100644
--- a/trunk/arch/x86/boot/edd.c
+++ b/trunk/arch/x86/boot/edd.c
@@ -167,9 +167,8 @@ void query_edd(void)
 		 * Scan the BIOS-supported hard disks and query EDD
 		 * information...
 		 */
-		get_edd_info(devno, &ei);
-
-		if (boot_params.eddbuf_entries < EDDMAXNR) {
+		if (!get_edd_info(devno, &ei)
+		    && boot_params.eddbuf_entries < EDDMAXNR) {
 			memcpy(edp, &ei, sizeof ei);
 			edp++;
 			boot_params.eddbuf_entries++;