From c239470acb1669b02f20a7eade5961ab7db51fc2 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 4 Oct 2006 17:26:23 +0200 Subject: [PATCH] --- yaml --- r: 38999 b: refs/heads/master c: f7e2ce788677ca0996d360202b91524db894c7b2 h: refs/heads/master i: 38997: b98ad6cccb9b75e76930357c693c48730a67c052 38995: d9941b3de66933f54578a4af58264b2acf2b7751 38991: e03e508cf05dfcc0e9a7c5f18d3b1f498270b651 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/cell/spider-pic.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8d2de137253f..8a4f018156ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68272047c51145a8aa4f3b6ae27edae6986c28cc +refs/heads/master: f7e2ce788677ca0996d360202b91524db894c7b2 diff --git a/trunk/arch/powerpc/platforms/cell/spider-pic.c b/trunk/arch/powerpc/platforms/cell/spider-pic.c index 608b1ebc56b2..6794de0cc0f0 100644 --- a/trunk/arch/powerpc/platforms/cell/spider-pic.c +++ b/trunk/arch/powerpc/platforms/cell/spider-pic.c @@ -244,7 +244,6 @@ 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 */ @@ -252,9 +251,8 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic) 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);