Datasheet on collision:
        SMBus Collision (SMBCOL_STS)
        This bit is set when a SMBus Collision condition occurs and
        SMBus Host loses in the bus arbitration. The software should
        clear this bit and re-start SMBus operation.

As the status will be cleared in transaction_end, we can remove the
sis630_write and prepare to return -EAGAIN to retry.

Signed-off-by: Amaury Decrême <[email protected]>
---
 drivers/i2c/busses/i2c-sis630.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index 3124d80..e152d36 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -200,12 +200,7 @@ static int sis630_transaction_wait(struct i2c_adapter 
*adap, int size)
 
        if (temp & 0x04) {
                dev_err(&adap->dev, "Bus collision!\n");
-               result = -EIO;
-               /*
-                 TBD: Datasheet say:
-                 the software should clear this bit and restart SMBUS 
operation.
-                 Should we do it or user start request again?
-               */
+               result = -EAGAIN;
        }
 
        return result;
-- 
1.7.12.4

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to