diff --git a/[refs] b/[refs]
index cc1f34992110..487de0b96c98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3e49afbb66109613c3474f2273f5830ac2dcb09
+refs/heads/master: f6266e34713dc286b52623d8a4ff846973c0bcce
diff --git a/trunk/drivers/firmware/edd.c b/trunk/drivers/firmware/edd.c
index 744011989044..9e4f59dc7f1e 100644
--- a/trunk/drivers/firmware/edd.c
+++ b/trunk/drivers/firmware/edd.c
@@ -753,7 +753,7 @@ edd_init(void)
 
 	if (!edd_num_devices()) {
 		printk(KERN_INFO "EDD information not available.\n");
-		return 1;
+		return -ENODEV;
 	}
 
 	edd_kset = kset_create_and_add("edd", NULL, firmware_kobj);