From: Rob Herring Date: Mon, 28 Nov 2011 02:16:33 +0000 (-0600) Subject: of/irq: of_irq_init: add check for parent equal to child node X-Git-Tag: MMI-PSA29.97-13-9~17945^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d7fb6d0adb86ed1c5290e754092a5a1e3de76ee9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Tested-by: Pawel Moll Tested-by: Stephen Warren --- 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); }