[PATCH v3 05/14 RESEND] irqchip/davinci-cp-intc: Fix potential resource leaks

[Tiezhu Yang]

There exists potential resource leaks in the error path, fix them.

Fixes: 0fc3d74cf946 ("irqchip: davinci-cp-intc: move the driver to 
drivers/irqchip")
Signed-off-by: Tiezhu Yang <yangtie...@loongson.cn>
---
 drivers/irqchip/irq-davinci-cp-intc.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/irqchip/irq-davinci-cp-intc.c 
b/drivers/irqchip/irq-davinci-cp-intc.c
index 276da277..2c2e115 100644
--- a/drivers/irqchip/irq-davinci-cp-intc.c
+++ b/drivers/irqchip/irq-davinci-cp-intc.c
@@ -162,6 +162,7 @@ davinci_cp_intc_do_init(const struct davinci_cp_intc_config 
*config,
        unsigned int num_regs = BITS_TO_LONGS(config->num_irqs);
        int offset, irq_base;
        void __iomem *req;
+       int ret;
 
        req = request_mem_region(config->reg.start,
                                 resource_size(&config->reg),
@@ -175,7 +176,8 @@ davinci_cp_intc_do_init(const struct davinci_cp_intc_config 
*config,
                                       resource_size(&config->reg));
        if (!davinci_cp_intc_base) {
                pr_err("%s: unable to ioremap register range\n", __func__);
-               return -EINVAL;
+               ret = -EINVAL;
+               goto err_release;
        }
 
        davinci_cp_intc_write(0, DAVINCI_CP_INTC_GLOBAL_ENABLE);
@@ -210,7 +212,8 @@ davinci_cp_intc_do_init(const struct davinci_cp_intc_config 
*config,
        if (irq_base < 0) {
                pr_err("%s: unable to allocate interrupt descriptors: %d\n",
                       __func__, irq_base);
-               return irq_base;
+               ret = irq_base;
+               goto err_iounmap;
        }
 
        davinci_cp_intc_irq_domain = irq_domain_add_legacy(
@@ -219,7 +222,8 @@ davinci_cp_intc_do_init(const struct davinci_cp_intc_config 
*config,
 
        if (!davinci_cp_intc_irq_domain) {
                pr_err("%s: unable to create an interrupt domain\n", __func__);
-               return -EINVAL;
+               ret = -EINVAL;
+               goto err_free_descs;
        }
 
        set_handle_irq(davinci_cp_intc_handle_irq);
@@ -228,6 +232,14 @@ davinci_cp_intc_do_init(const struct 
davinci_cp_intc_config *config,
        davinci_cp_intc_write(1, DAVINCI_CP_INTC_GLOBAL_ENABLE);
 
        return 0;
+
+err_free_descs:
+       irq_free_descs(irq_base, config->num_irqs);
+err_iounmap:
+       iounmap(davinci_cp_intc_base);
+err_release:
+       release_mem_region(config->reg.start, resource_size(&config->reg));
+       return ret;
 }
 
 int __init davinci_cp_intc_init(const struct davinci_cp_intc_config *config)
-- 
2.1.0