Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0bcd8df authored by Weifeng Voon's avatar Weifeng Voon Committed by Wolfram Sang
Browse files

i2c: designware: Use transfer timeout from ioctl I2C_TIMEOUT 



This allows applications to set the transfer timeout in 10ms increments via
ioctl I2C_TIMEOUT.

Signed-off-by: default avatarWeifeng Voon <weifeng.voon@intel.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 0130944b

drivers/i2c/busses/i2c-designware-core.c

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) 
	i2c_dw_xfer_init(dev);



	/* wait for tx to complete */

	if (!wait_for_completion_timeout(&dev->cmd_complete, HZ)) {

	if (!wait_for_completion_timeout(&dev->cmd_complete, adap->timeout)) {

		dev_err(dev->dev, "controller timed out\n");

		/* i2c_dw_init implicitly disables the adapter */

		i2c_dw_init(dev);