---

yaml --- r: 101311 b: refs/heads/master c: dcb5c92 h: refs/heads/master i: 101309: a9989de 101307: 1f7932f 101303: 62badbf 101295: 38f1ad8 101279: c3b7c5d 101247: f8eb2d6 v: v3
git-mirror · Jul 14, 2008 · 00b4a66 · 00b4a66
1 parent ebd46e2
commit 00b4a66
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90df2cb1c8822ef8d06a2b30627e7a810218b0dd
+refs/heads/master: dcb5c9239de8d3ff1c663e75f0f1c75bcb21ee20
diff --git a/trunk/drivers/i2c/busses/i2c-i801.c b/trunk/drivers/i2c/busses/i2c-i801.c
@@ -179,10 +179,8 @@ static int i801_transaction(int xact)
 	}
 
 	if (temp & SMBHSTSTS_BUS_ERR) {
-		result = -EIO;
-		dev_err(&I801_dev->dev, "Bus collision! SMBus may be locked "
-			"until next hard reset. (sorry!)\n");
-		/* Clock stops and slave is stuck in mid-transmission */
+		result = -EAGAIN;
+		dev_dbg(&I801_dev->dev, "Lost arbitration\n");
 	}
 
 	if (temp & SMBHSTSTS_DEV_ERR) {
@@ -339,8 +337,8 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data,
 			dev_dbg(&I801_dev->dev,
 				"Error: Failed bus transaction\n");
 		} else if (temp & SMBHSTSTS_BUS_ERR) {
-			result = -EIO;
-			dev_err(&I801_dev->dev, "Bus collision!\n");
+			result = -EAGAIN;
+			dev_dbg(&I801_dev->dev, "Lost arbitration\n");
 		} else if (temp & SMBHSTSTS_DEV_ERR) {
 			result = -ENXIO;
 			dev_dbg(&I801_dev->dev, "Error: no response!\n");