Commit 6f64a5eb authored by Linus Torvalds's avatar Linus Torvalds

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
parents 5e89d62e 2d5b205d
...@@ -16,6 +16,8 @@ void gic_enable_of_quirks(const struct device_node *np, ...@@ -16,6 +16,8 @@ void gic_enable_of_quirks(const struct device_node *np,
const struct gic_quirk *quirks, void *data) const struct gic_quirk *quirks, void *data)
{ {
for (; quirks->desc; quirks++) { for (; quirks->desc; quirks++) {
if (!quirks->compatible && !quirks->property)
continue;
if (quirks->compatible && if (quirks->compatible &&
!of_device_is_compatible(np, quirks->compatible)) !of_device_is_compatible(np, quirks->compatible))
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment