If we managed to get a client release SDA again, send a STOP afterwards
to make sure we have a consistent state on the bus again.

Cc: Phil Reid <[email protected]>
Cc: Andy Shevchenko <[email protected]>
Cc: Jarkko Nikula <[email protected]>
Cc: Claudio Foellmi <[email protected]>
Cc: Andrzej Hajda <[email protected]>
Signed-off-by: Wolfram Sang <[email protected]>
---
 drivers/i2c/i2c-core-base.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index dae7f4a783dbe4..29d6606d653229 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -200,6 +200,18 @@ int i2c_generic_scl_recovery(struct i2c_adapter *adap)
        if (bri->get_sda && !bri->get_sda(adap))
                ret = -EBUSY;
 
+       /* If all went well, send STOP for a sane bus state. */
+       if (ret == 0 && bri->set_sda) {
+               bri->set_scl(adap, 0);
+               ndelay(RECOVERY_NDELAY / 2);
+               bri->set_sda(adap, 0);
+               ndelay(RECOVERY_NDELAY / 2);
+               bri->set_scl(adap, 1);
+               ndelay(RECOVERY_NDELAY / 2);
+               bri->set_sda(adap, 1);
+               ndelay(RECOVERY_NDELAY / 2);
+       }
+
        if (bri->unprepare_recovery)
                bri->unprepare_recovery(adap);
 
-- 
2.11.0

Reply via email to