summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-06-04 11:57:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2023-06-04 11:57:38 -0400
commit6f64a5ebe1dc64add6e1d8ed3113200909988c02 (patch)
treed3ca55bb160c28fe5d3677fb10f29e2e0a04e4e3
parent5e89d62ec1014800e411868b8d750f9d631bdd01 (diff)
parent2d5b205dfa32b5f0f357ebc9db73931d2186391e (diff)
Merge tag 'irq_urgent_for_v6.4_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Borislav Petkov: - Fix open firmware quirks validation so that they don't get applied wrongly * tag 'irq_urgent_for_v6.4_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/gic: Correctly validate OF quirk descriptors
-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 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;