aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2023-05-31 19:42:53 +0200
committerThomas Gleixner <tglx@linutronix.de>2023-05-31 19:42:53 +0200
commit2d5b205dfa32b5f0f357ebc9db73931d2186391e (patch)
treea492c3e9778d66875d171f56505d309c9fd9ebe8
parent4115af49d2c24e840461fb83027315e2d2de6db4 (diff)
parent91539341a3b6e9c868024a4292455dae36e6f58c (diff)
downloadiio-2d5b205dfa32b5f0f357ebc9db73931d2186391e.tar.gz
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
-rw-r--r--drivers/irqchip/irq-gic-common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-gic-common.c b/drivers/irqchip/irq-gic-common.c
index de47b51cdadbe1..afd6a1841715a1 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;