projects
/
platform
/
kernel
/
linux-rpi3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ca1f8da
)
i2c: at91: don't account as iowait
author
Wolfram Sang
<wsa@the-dreams.de>
Mon, 3 Nov 2014 20:16:16 +0000
(21:16 +0100)
committer
Wolfram Sang
<wsa@the-dreams.de>
Fri, 7 Nov 2014 17:56:31 +0000
(18:56 +0100)
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>
Cc: stable@kernel.org
drivers/i2c/busses/i2c-at91.c
patch
|
blob
|
history
diff --git
a/drivers/i2c/busses/i2c-at91.c
b/drivers/i2c/busses/i2c-at91.c
index
917d545
..
e05a672
100644
(file)
--- 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");