diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2014-11-03 21:16:16 +0100 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-11-13 19:03:07 +0100 |
commit | f95c7176a5ddd27632da6b1dbabb529e20f5581f (patch) | |
tree | 075bffb911f164d2dfb237b3ee5755d26e13a0b0 | |
parent | 7f7ae192a6d6472d06a2d5a05daba04ce9facc43 (diff) | |
download | lwn-f95c7176a5ddd27632da6b1dbabb529e20f5581f.tar.gz lwn-f95c7176a5ddd27632da6b1dbabb529e20f5581f.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: Jiri Slaby <jslaby@suse.cz>
-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 2f6d43bd0728..174445303b9f 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"); |