Commit 499b9194 authored by Amaury Decrême's avatar Amaury Decrême Committed by Wolfram Sang

i2c: sis630: fix behavior after collision

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: default avatarAmaury Decrême <amaury.decreme@gmail.com>
Reviewed-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarWolfram Sang <wolfram@the-dreams.de>
parent aa9e7a39
...@@ -200,12 +200,7 @@ static int sis630_transaction_wait(struct i2c_adapter *adap, int size) ...@@ -200,12 +200,7 @@ static int sis630_transaction_wait(struct i2c_adapter *adap, int size)
if (temp & 0x04) { if (temp & 0x04) {
dev_err(&adap->dev, "Bus collision!\n"); dev_err(&adap->dev, "Bus collision!\n");
result = -EIO; result = -EAGAIN;
/*
TBD: Datasheet say:
the software should clear this bit and restart SMBUS operation.
Should we do it or user start request again?
*/
} }
return result; return result;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment