mfd: stmfx: Fix stmfx_irq_init error path
authorAmelie Delaunay <amelie.delaunay@st.com>
Wed, 22 Apr 2020 09:08:32 +0000 (11:08 +0200)
committerLee Jones <lee.jones@linaro.org>
Tue, 26 May 2020 09:51:21 +0000 (10:51 +0100)
In case the interrupt signal can't be configured, IRQ domain needs to be
removed.

Fixes: 06252ade9156 ("mfd: Add ST Multi-Function eXpander (STMFX) core driver")
Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/stmfx.c

index fde6541..1977fe9 100644 (file)
@@ -287,14 +287,19 @@ static int stmfx_irq_init(struct i2c_client *client)
 
        ret = regmap_write(stmfx->map, STMFX_REG_IRQ_OUT_PIN, irqoutpin);
        if (ret)
-               return ret;
+               goto irq_exit;
 
        ret = devm_request_threaded_irq(stmfx->dev, client->irq,
                                        NULL, stmfx_irq_handler,
                                        irqtrigger | IRQF_ONESHOT,
                                        "stmfx", stmfx);
        if (ret)
-               stmfx_irq_exit(client);
+               goto irq_exit;
+
+       return 0;
+
+irq_exit:
+       stmfx_irq_exit(client);
 
        return ret;
 }