aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2020-08-06 10:57:45 +0100
committerMarc Zyngier <maz@kernel.org>2020-08-17 08:06:11 +0100
commit7828a3ef8646fb2e69ed45616c8453a037ca7867 (patch)
tree689ca538b0be9176bbaa8b290d7ef07215f8f36b
parentarm64: dts: k3-am65: Update the RM resource types (diff)
downloadlinux-dev-7828a3ef8646fb2e69ed45616c8453a037ca7867.tar.xz
linux-dev-7828a3ef8646fb2e69ed45616c8453a037ca7867.zip
irqchip: Fix probing deferal when using IRQCHIP_PLATFORM_DRIVER helpers
When probing an interrupt controller that is behind a parent, we try to check whether the parent domain is available as an indication that we can actually try to probe. Unfortunately, we are checking this with the firmware node of the about to be probed device, not the parent. This is obviously bound to fail. Instead, use the parent node. Fixes: f8410e626569 ("irqchip: Add IRQCHIP_PLATFORM_DRIVER_BEGIN/END and IRQCHIP_MATCH helper macros") Reported-by: John Stultz <john.stultz@linaro.org> Tested-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Marc Zyngier <maz@kernel.org>
-rw-r--r--drivers/irqchip/irqchip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c
index 1bb0e36c2bf3..d2341153e181 100644
--- a/drivers/irqchip/irqchip.c
+++ b/drivers/irqchip/irqchip.c
@@ -52,7 +52,7 @@ int platform_irqchip_probe(struct platform_device *pdev)
* interrupt controller. The actual initialization callback of this
* interrupt controller can check for specific domains as necessary.
*/
- if (par_np && !irq_find_matching_host(np, DOMAIN_BUS_ANY))
+ if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY))
return -EPROBE_DEFER;
return irq_init_cb(np, par_np);