diff options
| author | Shouming Wang <wangshm@marvell.com> | 2015-07-14 09:36:42 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2015-08-10 08:37:30 +0200 |
| commit | 8bd75bd3038df5e743c7daa84c2d34d13493b395 (patch) | |
| tree | 602056af7dea9d2c3f81e66b593de7c497329fe4 | |
| parent | i2c: pxa: No need to set slave addr for i2c master mode reset (diff) | |
| download | linux-8bd75bd3038df5e743c7daa84c2d34d13493b395.tar.xz linux-8bd75bd3038df5e743c7daa84c2d34d13493b395.zip | |
i2c: pxa: Return I2C_RETRY when timeout in pio mode
In case of timeout in pio mode of operation return I2C_RETRY.
This behavior will be same as interrupt mode of operation.
Signed-off-by: Shouming Wang <wangshm@marvell.com>
[vaibhav.hiremath@linaro.org: Updated changelog]
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 023e59fda650..632008f24098 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -745,8 +745,10 @@ static int i2c_pxa_do_pio_xfer(struct pxa_i2c *i2c, ret = i2c->msg_idx; out: - if (timeout == 0) + if (timeout == 0) { i2c_pxa_scream_blue_murder(i2c, "timeout"); + ret = I2C_RETRY; + } return ret; } |