diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-04 17:58:53 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-04 17:58:53 +0300 |
commit | 5aac99c6b51cf38ef339b89600add9e508e7e2f9 (patch) | |
tree | f9c1713ada6e8180e1ffcfe19bf272477afca6ca /drivers/irqchip/irq-qcom-mpm.c | |
parent | e8ab83e34bdc458b5cd77f201e4ed04807978fb1 (diff) | |
parent | 38a05c0b87833f5b188ae43b428b1f792df2b384 (diff) | |
download | linux-5aac99c6b51cf38ef339b89600add9e508e7e2f9.tar.xz |
Merge tag 'irq-urgent-2025-05-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Ingo Molnar:
- Prevent NULL pointer dereference in msi_domain_debug_show()
- Fix crash in the qcom-mpm irqchip driver when configuring
interrupts for non-wake GPIOs
* tag 'irq-urgent-2025-05-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/qcom-mpm: Prevent crash when trying to handle non-wake GPIOs
genirq/msi: Prevent NULL pointer dereference in msi_domain_debug_show()
Diffstat (limited to 'drivers/irqchip/irq-qcom-mpm.c')
-rw-r--r-- | drivers/irqchip/irq-qcom-mpm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-qcom-mpm.c b/drivers/irqchip/irq-qcom-mpm.c index 7942d8eb3d00..f772deb9cba5 100644 --- a/drivers/irqchip/irq-qcom-mpm.c +++ b/drivers/irqchip/irq-qcom-mpm.c @@ -227,6 +227,9 @@ static int qcom_mpm_alloc(struct irq_domain *domain, unsigned int virq, if (ret) return ret; + if (pin == GPIO_NO_WAKE_IRQ) + return irq_domain_disconnect_hierarchy(domain, virq); + ret = irq_domain_set_hwirq_and_chip(domain, virq, pin, &qcom_mpm_chip, priv); if (ret) |