Merge tag 'irq-urgent-2026-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit b5fddfad3482 · 2026-03-22T09:55:58.000-07:00
Pull irq fix from Ingo Molnar:
 "Fix a mailbox channel leak in the riscv-rpmi-sysmsi irqchip driver"

* tag 'irq-urgent-2026-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/riscv-rpmi-sysmsi: Fix mailbox channel leak in rpmi_sysmsi_probe()
diff --git a/drivers/irqchip/irq-riscv-rpmi-sysmsi.c b/drivers/irqchip/irq-riscv-rpmi-sysmsi.c
@@ -250,6 +250,7 @@ static int rpmi_sysmsi_probe(struct platform_device *pdev)
 		rc = riscv_acpi_get_gsi_info(fwnode, &priv->gsi_base, &id,
 					     &nr_irqs, NULL);
 		if (rc) {
+			mbox_free_channel(priv->chan);
 			dev_err(dev, "failed to find GSI mapping\n");
 			return rc;
 		}

Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,7 @@ static int rpmi_sysmsi_probe(struct platform_device *pdev)`
`250`	`250`	`rc = riscv_acpi_get_gsi_info(fwnode, &priv->gsi_base, &id,`
`251`	`251`	`&nr_irqs, NULL);`
`252`	`252`	`if (rc) {`
	`253`	`+ mbox_free_channel(priv->chan);`
`253`	`254`	`dev_err(dev, "failed to find GSI mapping\n");`
`254`	`255`	`return rc;`
`255`	`256`	`}`