| From 0ff40493ee2e448b8494759c73ab73b3eaac7118 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Sat, 20 Jun 2015 21:03:19 +0200 |
| Subject: [PATCH 091/129] i2c: rcar: use adapter default for timeout |
| |
| 5 seconds is a very large timeout, and it is hardcoded. Use the default |
| timeout from 'struct adapter' which is 1 second. It can also be modified |
| from userspace for specific workloads via i2c-dev. |
| |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Wolfram Sang <wsa@the-dreams.de> |
| (cherry picked from commit efd2c6118e49152bea891706432ac3c9579836fe) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/i2c/busses/i2c-rcar.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c |
| index 9eef46254369..e57e520b4756 100644 |
| --- a/drivers/i2c/busses/i2c-rcar.c |
| +++ b/drivers/i2c/busses/i2c-rcar.c |
| @@ -532,7 +532,7 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, |
| |
| timeout = wait_event_timeout(priv->wait, |
| rcar_i2c_flags_has(priv, ID_DONE), |
| - 5 * HZ); |
| + adap->timeout); |
| if (!timeout) { |
| ret = -ETIMEDOUT; |
| break; |
| -- |
| 2.6.2 |
| |
