Commit 1391af03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5401b9ad af416cd9

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

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static void aplic_pm_remove(void *data) 
	struct device *dev = priv->dev;



	list_del(&priv->head);

	if (dev->pm_domain)

	if (dev->pm_domain && dev->of_node)

		dev_pm_genpd_remove_notifier(dev);

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


	priv->saved_hw_regs.srcs = srcs;

	list_add(&priv->head, &aplics);

	if (dev->pm_domain) {

	if (dev->pm_domain && dev->of_node) {

		priv->genpd_nb.notifier_call = aplic_pm_notifier;

		ret = dev_pm_genpd_add_notifier(dev, &priv->genpd_nb);

		if (ret)