i2c: omap: Handle omap_i2c_init() errors in omap_i2c_probe()

commit a9503a2ecd95e23d7243bcde7138192de8c1c281 upstream.

omap_i2c_init() can fail. Handle this error in omap_i2c_probe().

Fixes: 010d442c4a29 ("i2c: New bus driver for TI OMAP boards")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: <stable@vger.kernel.org> # v2.6.19+
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/565311abf9bafd7291ca82bcecb48c1fac1e727b.1751701715.git.christophe.jaillet@wanadoo.fr
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 16c5d79143ff837204037d60827e796b83e7cce2..534ca652c3b2974110f9829b13198a076e77f393 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1475,7 +1475,9 @@ omap_i2c_probe(struct platform_device *pdev)
        }
 
        /* reset ASAP, clearing any IRQs */
-       omap_i2c_init(omap);
+       r = omap_i2c_init(omap);
+       if (r)
+               goto err_mux_state_deselect;
 
        if (omap->rev < OMAP_I2C_OMAP1_REV_2)
                r = devm_request_irq(&pdev->dev, omap->irq, omap_i2c_omap1_isr,
@@ -1518,6 +1520,7 @@ omap_i2c_probe(struct platform_device *pdev)
 
 err_unuse_clocks:
        omap_i2c_write_reg(omap, OMAP_I2C_CON_REG, 0);
+err_mux_state_deselect:
        if (omap->mux_state)
                mux_state_deselect(omap->mux_state);
 err_put_pm: