diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2015-06-20 15:03:19 -0400 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2015-06-23 13:50:10 -0400 |
| commit | efd2c6118e49152bea891706432ac3c9579836fe (patch) | |
| tree | ffea2be11a39b6e891d6288efc8a7e3b6177db45 | |
| parent | edfc39012364a6ea8e4c7067c2655c92c2d02df4 (diff) | |
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>
| -rw-r--r-- | drivers/i2c/busses/i2c-rcar.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
| 532 | 532 | ||
| 533 | timeout = wait_event_timeout(priv->wait, | 533 | timeout = wait_event_timeout(priv->wait, |
| 534 | rcar_i2c_flags_has(priv, ID_DONE), | 534 | rcar_i2c_flags_has(priv, ID_DONE), |
| 535 | 5 * HZ); | 535 | adap->timeout); |
| 536 | if (!timeout) { | 536 | if (!timeout) { |
| 537 | ret = -ETIMEDOUT; | 537 | ret = -ETIMEDOUT; |
| 538 | break; | 538 | break; |
