---

yaml
---
r: 38999
b: refs/heads/master
c: f7e2ce7
h: refs/heads/master
i:
  38997: b98ad6c
  38995: d9941b3
  38991: e03e508
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68272047c51145a8aa4f3b6ae27edae6986c28cc
+refs/heads/master: f7e2ce788677ca0996d360202b91524db894c7b2

trunk/arch/powerpc/platforms/cell/spider-pic.c

@@ -244,17 +244,15 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)
 	int imaplen, intsize, unit;
 	struct device_node *iic;
 
-#if 0 /* Enable that when we have a way to retreive the node as well */
 	/* First, we check wether we have a real "interrupts" in the device
 	 * tree in case the device-tree is ever fixed
 	 */
 	struct of_irq oirq;
 	if (of_irq_map_one(pic->of_node, 0, &oirq) == 0) {
 		virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
 					     oirq.size);
-		goto bail;
+		return virq;
 	}
-#endif
 
 	/* Now do the horrible hacks */
 	tmp = get_property(pic->of_node, "#interrupt-cells", NULL);