diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-18 11:08:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-18 11:08:01 +0200 |
| commit | bf14c18a2cbf65687c59a11f5e4824c4a0c8182b (patch) | |
| tree | 5bc354498da520c44ebefa8fbe970b0404838553 /drivers/irqchip/irq-riscv-intc.c | |
| parent | ffd8e8bd26e945a957e827427e8cbe8fa8e23d0d (diff) | |
| parent | 6ba59ff4227927d3a8530fc2973b80e94b54d58f (diff) | |
Merge tag 'v6.10-rc4' into tty-next
We need the tty/serial fixes in here as well
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/irqchip/irq-riscv-intc.c')
| -rw-r--r-- | drivers/irqchip/irq-riscv-intc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-riscv-intc.c b/drivers/irqchip/irq-riscv-intc.c index 9e71c4428814..4f3a12383a1e 100644 --- a/drivers/irqchip/irq-riscv-intc.c +++ b/drivers/irqchip/irq-riscv-intc.c @@ -253,8 +253,9 @@ IRQCHIP_DECLARE(andes, "andestech,cpu-intc", riscv_intc_init); static int __init riscv_intc_acpi_init(union acpi_subtable_headers *header, const unsigned long end) { - struct fwnode_handle *fn; struct acpi_madt_rintc *rintc; + struct fwnode_handle *fn; + int rc; rintc = (struct acpi_madt_rintc *)header; @@ -273,7 +274,11 @@ static int __init riscv_intc_acpi_init(union acpi_subtable_headers *header, return -ENOMEM; } - return riscv_intc_init_common(fn, &riscv_intc_chip); + rc = riscv_intc_init_common(fn, &riscv_intc_chip); + if (rc) + irq_domain_free_fwnode(fn); + + return rc; } IRQCHIP_ACPI_DECLARE(riscv_intc, ACPI_MADT_TYPE_RINTC, NULL, |