diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2014-11-03 21:16:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 09:00:13 -0800 |
| commit | 3bbb515a6b12b1c6b7ce2ea297fc12d79a84fc90 (patch) | |
| tree | 12e3300f03a6a8dd6995616d484805b3822a349d /drivers/i2c | |
| parent | cdd391a539ad4490c1bffc18353d01985a16a814 (diff) | |
| download | kernel-common-3bbb515a6b12b1c6b7ce2ea297fc12d79a84fc90.tar.gz kernel-common-3bbb515a6b12b1c6b7ce2ea297fc12d79a84fc90.tar.bz2 kernel-common-3bbb515a6b12b1c6b7ce2ea297fc12d79a84fc90.zip | |
i2c: at91: don't account as iowait
commit 11cfbfb098b22d3e57f1f2be217cad20e2d48463 upstream.
iowait is for blkio [1]. I2C shouldn't use it.
[1] https://lkml.org/lkml/2014/11/3/317
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-at91.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c index 11e9c7f9bf9b..8873d84e1d4f 100644 --- a/drivers/i2c/busses/i2c-at91.c +++ b/drivers/i2c/busses/i2c-at91.c @@ -434,7 +434,7 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev) } } - ret = wait_for_completion_io_timeout(&dev->cmd_complete, + ret = wait_for_completion_timeout(&dev->cmd_complete, dev->adapter.timeout); if (ret == 0) { dev_err(dev->dev, "controller timed out\n"); |