From mboxrd@z Thu Jan 1 00:00:00 1970 From: Weifeng Voon Subject: [PATCH v2] i2c: designware: Use transfer timeout from ioctl I2C_TIMEOUT Date: Wed, 15 Jun 2016 16:55:46 +0800 Message-ID: <1465980946-20895-1-git-send-email-weifeng.voon@intel.com> Return-path: Received: from mga04.intel.com ([192.55.52.120]:26128 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752736AbcFOI4N (ORCPT ); Wed, 15 Jun 2016 04:56:13 -0400 Sender: linux-i2c-owner@vger.kernel.org List-Id: linux-i2c@vger.kernel.org To: Wolfram Sang , Jarkko Nikula Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , jui.nee.tan@intel.com, Weifeng Voon 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 --- 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