---

yaml --- r: 358802 b: refs/heads/master c: 499b919 h: refs/heads/master v: v3
git-mirror · Feb 11, 2013 · fbe8d1b · fbe8d1b
1 parent 65bb35d
commit fbe8d1b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa9e7a39c5a5a77ff02670ef915f4c6712bc7658
+refs/heads/master: 499b9194ad7b7b6d7c06b01005508e5bcf3c8980
diff --git a/trunk/drivers/i2c/busses/i2c-sis630.c b/trunk/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;