diff --git a/[refs] b/[refs]
index c45b169c515b..f47e579ec35e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbb84c4cc1ad0ab8faaffd899ccc9b14a88c91be
+refs/heads/master: 00a30b254b88d2d4f5af00835a9b7f70326def9b
diff --git a/trunk/arch/x86/kernel/devicetree.c b/trunk/arch/x86/kernel/devicetree.c
index 7a8cebc9ff29..9c91badb6ca9 100644
--- a/trunk/arch/x86/kernel/devicetree.c
+++ b/trunk/arch/x86/kernel/devicetree.c
@@ -65,7 +65,7 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
 		return 0;
 	ret = ih->xlate(ih, intspec, intsize, &virq, &type);
 	if (ret)
-		return ret;
+		return 0;
 	if (type == IRQ_TYPE_NONE)
 		return virq;
 	/* set the mask if it is different from current */