Commit de87b603 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Wolfram Sang
Browse files

i2c: mediatek: Fix an error handling path in mtk_i2c_probe() 



The clsk are prepared, enabled, then disabled. So if an error occurs after
the disable step, they are still prepared.

Add an error handling path to unprepare the clks in such a case, as already
done in the .remove function.

Fixes: 8b4fc246 ("i2c: mediatek: Optimize master_xfer() and avoid circular locking")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarQii Wang <qii.wang@mediatek.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 27071b5c

drivers/i2c/busses/i2c-mt65xx.c

+7 −2
Original line number Diff line number Diff line
@@ -1420,17 +1420,22 @@ static int mtk_i2c_probe(struct platform_device *pdev) 
	if (ret < 0) {

		dev_err(&pdev->dev,

			"Request I2C IRQ %d fail\n", irq);

		return ret;

		goto err_bulk_unprepare;

	}



	i2c_set_adapdata(&i2c->adap, i2c);

	ret = i2c_add_adapter(&i2c->adap);

	if (ret)

		return ret;

		goto err_bulk_unprepare;



	platform_set_drvdata(pdev, i2c);



	return 0;



err_bulk_unprepare:

	clk_bulk_unprepare(I2C_MT65XX_CLK_MAX, i2c->clocks);



	return ret;

}



static int mtk_i2c_remove(struct platform_device *pdev)