In case of timeout during msg xfer assert reset to
i2c controller for both interrupt and PIO mode of operation.
Signed-off-by: Jett.Zhou <jtzhou@xxxxxxxxxxx>
[vaibhav.hiremath@xxxxxxxxxx: Split & merge patches into logical changes
and update the Changelog]
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@xxxxxxxxxx>
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@xxxxxxxxxx>
---
drivers/i2c/busses/i2c-pxa.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 2777d5c..3c6ebb5 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -197,6 +197,8 @@ struct pxa_i2c {
*/
#define I2C_PXA_SLAVE_ADDR 0x1
+static void i2c_pxa_reset(struct pxa_i2c *i2c);
+
#ifdef DEBUG
struct bits {
@@ -846,6 +848,9 @@ out:
ret = I2C_RETRY;
}
+ if (ret < 0)
+ i2c_pxa_reset(i2c);
+
return ret;
}
@@ -912,6 +917,9 @@ static int i2c_pxa_do_xfer(struct pxa_i2c *i2c, struct i2c_msg *msg, int num)
}
out:
+ if (ret < 0)
+ i2c_pxa_reset(i2c);
+
return ret;
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
