Commit 666c23af authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Andi Shyti
Browse files

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



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

Fixes: b6ef830c ("i2c: omap: Add support for setting mux")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: <stable@vger.kernel.org> # v6.15+
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/998542981b6d2435c057dd8b9fe71743927babab.1749913149.git.christophe.jaillet@wanadoo.fr
parent 577c1e0e

drivers/i2c/busses/i2c-omap.c

+5 −2
Original line number Diff line number Diff line
@@ -1461,13 +1461,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;

		}

	}
@@ -1515,6 +1515,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: