[PATCH 3.13.y-ckt 042/121] i2c: at91: don't account as iowait
Kamal Mostafa
kamal at canonical.com
Tue Dec 2 19:18:41 UTC 2014
3.13.11-ckt12 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <wsa at the-dreams.de>
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 at the-dreams.de>
Acked-by: Ludovic Desroches <ludovic.desroches at atmel.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
drivers/i2c/busses/i2c-at91.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index a10632e..50fea6c 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");
--
1.9.1
More information about the kernel-team
mailing list