diff options
author | 2023-05-31 19:42:53 +0200 | |
---|---|---|
committer | 2023-05-31 19:42:53 +0200 | |
commit | 2d5b205dfa32b5f0f357ebc9db73931d2186391e (patch) | |
tree | a492c3e9778d66875d171f56505d309c9fd9ebe8 | |
parent | Merge tag 'irqchip-fixes-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent (diff) | |
parent | irqchip/gic: Correctly validate OF quirk descriptors (diff) | |
download | wireguard-linux-2d5b205dfa32b5f0f357ebc9db73931d2186391e.tar.xz wireguard-linux-2d5b205dfa32b5f0f357ebc9db73931d2186391e.zip |
Merge tag 'irqchip-fixes-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull an irqchip fix from Marc Zyngier:
- Fix regression introduced by the Mediatek workaround.
Link: https://lore.kernel.org/lkml/20230531160549.433528-1-maz@kernel.org
Diffstat (limited to '')
-rw-r--r-- | drivers/irqchip/irq-gic-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-gic-common.c b/drivers/irqchip/irq-gic-common.c index de47b51cdadb..afd6a1841715 100644 --- a/drivers/irqchip/irq-gic-common.c +++ b/drivers/irqchip/irq-gic-common.c @@ -16,6 +16,8 @@ void gic_enable_of_quirks(const struct device_node *np, const struct gic_quirk *quirks, void *data) { for (; quirks->desc; quirks++) { + if (!quirks->compatible && !quirks->property) + continue; if (quirks->compatible && !of_device_is_compatible(np, quirks->compatible)) continue; |