i2c: omap: Fix an error handling path in omap_i2c_probe()

commit 666c23af755dccca8c25b5d5200ca28153c69a05 upstream.

If an error occurs after calling mux_state_select(), mux_state_deselect()
should be called as already done in the remove function.

Fixes: b6ef830c60b6 ("i2c: omap: Add support for setting mux")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: <stable@vger.kernel.org> # v6.15+
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/998542981b6d2435c057dd8b9fe71743927babab.1749913149.git.christophe.jaillet@wanadoo.fr
Stable-dep-of: a9503a2ecd95 ("i2c: omap: Handle omap_i2c_init() errors in omap_i2c_probe()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index ffc116e76ba1867d0337fe9ae561b7561b388655..16c5d79143ff837204037d60827e796b83e7cce2 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1464,13 +1464,13 @@ omap_i2c_probe(struct platform_device *pdev)
                if (IS_ERR(mux_state)) {
                        r = PTR_ERR(mux_state);
                        dev_dbg(&pdev->dev, "failed to get I2C mux: %d\n", r);
-                       goto err_disable_pm;
+                       goto err_put_pm;
                }
                omap->mux_state = mux_state;
                r = mux_state_select(omap->mux_state);
                if (r) {
                        dev_err(&pdev->dev, "failed to select I2C mux: %d\n", r);
-                       goto err_disable_pm;
+                       goto err_put_pm;
                }
        }
 
@@ -1518,6 +1518,9 @@ omap_i2c_probe(struct platform_device *pdev)
 
 err_unuse_clocks:
        omap_i2c_write_reg(omap, OMAP_I2C_CON_REG, 0);
+       if (omap->mux_state)
+               mux_state_deselect(omap->mux_state);
+err_put_pm:
        pm_runtime_dont_use_autosuspend(omap->dev);
        pm_runtime_put_sync(omap->dev);
 err_disable_pm: