[PATCH v2] i2c: designware: Use transfer timeout from ioctl I2C_TIMEOUT

From	Weifeng Voon <weifeng.voon@intel.com>
Newsgroups	linux.kernel
Subject	[PATCH v2] i2c: designware: Use transfer timeout from ioctl I2C_TIMEOUT
Date	2016-06-15 11:00 +0200
Message-ID	<rKeQ2-iF-21@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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

changelog v2:
* No code change, just change to a more suitable title

Signed-off-by: Weifeng Voon <weifeng.voon@intel.com>
---
 drivers/i2c/busses/i2c-designware-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c
index 99b54be..c6922b8 100644
--- a/drivers/i2c/busses/i2c-designware-core.c
+++ b/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);
 
 	/* 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);
-- 
1.9.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] i2c: designware: Use transfer timeout from ioctl I2C_TIMEOUT Weifeng Voon <weifeng.voon@intel.com> - 2016-06-15 11:00 +0200
  Re: [PATCH v2] i2c: designware: Use transfer timeout from ioctl  I2C_TIMEOUT Jarkko Nikula <jarkko.nikula@linux.intel.com> - 2016-06-15 16:00 +0200

csiph-web