From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Date: Mon, 1 Aug 2022 19:28:07 +0000 (+0200)
Subject: irqchip/loongson-liointc: Fix an error handling path in liointc_init()
X-Git-Tag: v6.0-rc2~1^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a9084d888fbaaed65ded56f11d052cf8b04519a5;p=tomoyo%2Ftomoyo-test1.git

irqchip/loongson-liointc: Fix an error handling path in liointc_init()

All errors lead to the error handling path, except the one dealing
with "reg-names" in DT.

Fix it and release some resources before returning if this test fails.

Fixes: 0858ed035a85 ("irqchip/loongson-liointc: Add ACPI init support")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
[maz: fix commit message]
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/1a6d74ab70712279023aa7bdbd31bd3aec103bc0.1659382063.git.christophe.jaillet@wanadoo.fr
---

diff --git a/drivers/irqchip/irq-loongson-liointc.c b/drivers/irqchip/irq-loongson-liointc.c
index acd1a4b897df..0da8716f8f24 100644
--- a/drivers/irqchip/irq-loongson-liointc.c
+++ b/drivers/irqchip/irq-loongson-liointc.c
@@ -207,7 +207,7 @@ static int liointc_init(phys_addr_t addr, unsigned long size, int revision,
 					"reg-names", core_reg_names[i]);
 
 			if (index < 0)
-				return -EINVAL;
+				goto out_iounmap;
 
 			priv->core_isr[i] = of_iomap(node, index);
 		}