path: root/drivers/of
diff options
authorRob Herring <rob.herring@calxeda.com>2011-11-27 20:16:33 -0600
committerRob Herring <rob.herring@calxeda.com>2011-11-29 08:22:40 -0600
commitd7fb6d0adb86ed1c5290e754092a5a1e3de76ee9 (patch)
tree5f0596466babf4ceb943943dcfcb29e80bcc2ade /drivers/of
parentcaca6a03d365883564885f2c1da3e88dcf65d139 (diff)
of/irq: of_irq_init: add check for parent equal to child node
With the revert of "of/irq: of_irq_find_parent: check for parent equal to child" (dc9372808412edb), we need another way to handle parent node equal to the child node. This can simply be handled in of_irq_init by checking for this condition. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Tested-by: Pawel Moll <pawel.moll@arm.com> Tested-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'drivers/of')
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 791270b8bd1c..19c0115092dd 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -424,6 +424,8 @@ void __init of_irq_init(const struct of_device_id *matches)
desc->dev = np;
desc->interrupt_parent = of_irq_find_parent(np);
+ if (desc->interrupt_parent == np)
+ desc->interrupt_parent = NULL;
list_add_tail(&desc->list, &intc_desc_list);