diff options
| author | Marc Zyngier <maz@kernel.org> | 2022-12-05 13:45:41 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2022-12-05 13:45:41 +0300 |
| commit | 6ed54e1789a29d3f1557454cc7d2eb9c10d1d37b (patch) | |
| tree | 988447c7eb7e9100d414739128bee442ef5fb42b /drivers/irqchip/irq-loongson-liointc.c | |
| parent | 4363c8525e07e86a3f410981a2712b3bf6b04659 (diff) | |
| parent | 3ae977d0e4e3a2a2ccc912ca2d20c9430508ecdd (diff) | |
| download | linux-6ed54e1789a29d3f1557454cc7d2eb9c10d1d37b.tar.xz | |
Merge branch irq/misc-6.2 into irq/irqchip-next
* irq/misc-6.2:
: .
: Random minor fixes and improvments:
:
: - More Loongson fixes after the Loongarch merge
:
: - Error handling fixes for wpcm450, GIC...
:
: - BE detection for a FSL controller
:
: - Declare the Sifive PLIC as wake-up agnostic
:
: - Simplify fishing out the device data for the ST irqchip
:
: - Mark some data structures as __initconst in the apple-aic driver
:
: - Switch over from strtobool to kstrtobool
:
: - COMPILET_TEST fixes
:
: - and the mandatory "repeated word" commit...
: .
irqchip/ls-extirq: Fix endianness detection
irqchip/gic: Use kstrtobool() instead of strtobool()
irqchip/sifive-plic: Support wake IRQs
irqchip/loongson-liointc: Fix improper error handling in liointc_init()
irqchip/sl28cpld: Replace irqchip mask_invert with unmask_base
irqchip/wpcm450: Fix memory leak in wpcm450_aic_of_init()
irqchip/st: Use device_get_match_data() to simplify the code
irqchip/al-fic: Drop obsolete dependency on COMPILE_TEST
irqchip: gic-pm: Use pm_runtime_resume_and_get() in gic_probe()
irqchip/mips-gic: Drop repeated word in comment
irqchip/apple-aic: Mark aic_info structs __initconst
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'drivers/irqchip/irq-loongson-liointc.c')
| -rw-r--r-- | drivers/irqchip/irq-loongson-liointc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-loongson-liointc.c b/drivers/irqchip/irq-loongson-liointc.c index a4a7cccd1181..85b754f7f4e6 100644 --- a/drivers/irqchip/irq-loongson-liointc.c +++ b/drivers/irqchip/irq-loongson-liointc.c @@ -212,10 +212,13 @@ static int liointc_init(phys_addr_t addr, unsigned long size, int revision, "reg-names", core_reg_names[i]); if (index < 0) - goto out_iounmap; + continue; priv->core_isr[i] = of_iomap(node, index); } + + if (!priv->core_isr[0]) + goto out_iounmap; } /* Setup IRQ domain */ |