From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
To: Weifeng Voon <weifeng.voon@intel.com>, Wolfram Sang <wsa@the-dreams.de>
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
jui.nee.tan@intel.com
Subject: Re: [PATCH v3] i2c: designware: Use transfer timeout from ioctl I2C_TIMEOUT
Date: Fri, 17 Jun 2016 08:36:42 +0300 [thread overview]
Message-ID: <52b627ca-93b6-5c67-7d00-cf4c962ab5df@linux.intel.com> (raw)
In-Reply-To: <1466127995-28318-1-git-send-email-weifeng.voon@intel.com>
On 06/17/2016 04:46 AM, Weifeng Voon wrote:
> This allows applications to set the transfer timeout in 10ms increments via
> ioctl I2C_TIMEOUT.
>
> Signed-off-by: Weifeng Voon <weifeng.voon@intel.com>
> ---
> changelog v2:
> * No code change, just change to a more suitable title
>
> changelog v3:
> * Move changelog out of commit log
>
> 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);
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
next prev parent reply other threads:[~2016-06-17 5:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-17 1:46 [PATCH v3] i2c: designware: Use transfer timeout from ioctl I2C_TIMEOUT Weifeng Voon
2016-06-17 5:36 ` Jarkko Nikula [this message]
2016-06-17 7:15 ` Uwe Kleine-König
2016-06-19 16:54 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52b627ca-93b6-5c67-7d00-cf4c962ab5df@linux.intel.com \
--to=jarkko.nikula@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=jui.nee.tan@intel.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=weifeng.voon@intel.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).