Skip to content

Commit 1391af0

Browse files
committed
Merge tag 'irq-urgent-2026-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Ingo Molnar: - Fix RISC-V APLIC irqchip driver setup errors on ACPI systems (Jessica Liu) * tag 'irq-urgent-2026-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/riscv-aplic: Restrict genpd notifier to device tree only
2 parents 5401b9a + af416cd commit 1391af0

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/irqchip/irq-riscv-aplic-main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static void aplic_pm_remove(void *data)
150150
struct device *dev = priv->dev;
151151

152152
list_del(&priv->head);
153-
if (dev->pm_domain)
153+
if (dev->pm_domain && dev->of_node)
154154
dev_pm_genpd_remove_notifier(dev);
155155
}
156156

@@ -165,7 +165,7 @@ static int aplic_pm_add(struct device *dev, struct aplic_priv *priv)
165165

166166
priv->saved_hw_regs.srcs = srcs;
167167
list_add(&priv->head, &aplics);
168-
if (dev->pm_domain) {
168+
if (dev->pm_domain && dev->of_node) {
169169
priv->genpd_nb.notifier_call = aplic_pm_notifier;
170170
ret = dev_pm_genpd_add_notifier(dev, &priv->genpd_nb);
171171
if (ret)

0 commit comments

Comments
 (0)