[PATCH AUTOSEL 5.4 187/266] mfd: stmfx: Fix stmfx_irq_init error path

[Sasha Levin]

From: Amelie Delaunay <amelie.delau...@st.com>

[ Upstream commit 60c2c4bcb9202acad4cc26af20b44b6bd7874f7b ]

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.delau...@st.com>
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/mfd/stmfx.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c
index fde6541e347c..1977fe95f876 100644
--- a/drivers/mfd/stmfx.c
+++ b/drivers/mfd/stmfx.c
@@ -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;
 }
-- 
2.25.1