Browse Source

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: Weifeng Voon <weifeng.voon@intel.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Weifeng Voon 9 years ago
parent
commit
d0bcd8df9a
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/i2c/busses/i2c-designware-core.c

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

@@ -663,7 +663,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
 	i2c_dw_xfer_init(dev);
 	i2c_dw_xfer_init(dev);
 
 
 	/* wait for tx to complete */
 	/* 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");
 		dev_err(dev->dev, "controller timed out\n");
 		/* i2c_dw_init implicitly disables the adapter */
 		/* i2c_dw_init implicitly disables the adapter */
 		i2c_dw_init(dev);
 		i2c_dw_init(dev);