Merge tag 'irqchip-fixes-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

KAGA-KOKO · KAGA-KOKO · commit 2d5b205dfa32 · 2023-05-31T19:42:53.000+02:00
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
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ void gic_enable_of_quirks(const struct device_node *np,`
`16`	`16`	`const struct gic_quirk quirks, void data)`
`17`	`17`	`{`
`18`	`18`	`for (; quirks->desc; quirks++) {`
	`19`	`+ if (!quirks->compatible && !quirks->property)`
	`20`	`+ continue;`
`19`	`21`	`if (quirks->compatible &&`
`20`	`22`	`!of_device_is_compatible(np, quirks->compatible))`
`21`	`23`	`continue;`