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

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



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

Fixes: 010d442c ("i2c: New bus driver for TI OMAP boards")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: <stable@vger.kernel.org> # v2.6.19+
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/565311abf9bafd7291ca82bcecb48c1fac1e727b.1751701715.git.christophe.jaillet@wanadoo.fr
parent d7b8f8e2

drivers/i2c/busses/i2c-omap.c

+4 −1
Original line number Diff line number Diff line
@@ -1472,7 +1472,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,
@@ -1515,6 +1517,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: