Commit dcb5c923 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare

i2c-i801: Properly report bus arbitration loss

Bit BUS_ERR of the status register means that the ICH host controller
lost the arbitration. Report this event as such.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 90df2cb1
...@@ -179,10 +179,8 @@ static int i801_transaction(int xact) ...@@ -179,10 +179,8 @@ static int i801_transaction(int xact)
} }
if (temp & SMBHSTSTS_BUS_ERR) { if (temp & SMBHSTSTS_BUS_ERR) {
result = -EIO; result = -EAGAIN;
dev_err(&I801_dev->dev, "Bus collision! SMBus may be locked " dev_dbg(&I801_dev->dev, "Lost arbitration\n");
"until next hard reset. (sorry!)\n");
/* Clock stops and slave is stuck in mid-transmission */
} }
if (temp & SMBHSTSTS_DEV_ERR) { if (temp & SMBHSTSTS_DEV_ERR) {
...@@ -339,8 +337,8 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data, ...@@ -339,8 +337,8 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data,
dev_dbg(&I801_dev->dev, dev_dbg(&I801_dev->dev,
"Error: Failed bus transaction\n"); "Error: Failed bus transaction\n");
} else if (temp & SMBHSTSTS_BUS_ERR) { } else if (temp & SMBHSTSTS_BUS_ERR) {
result = -EIO; result = -EAGAIN;
dev_err(&I801_dev->dev, "Bus collision!\n"); dev_dbg(&I801_dev->dev, "Lost arbitration\n");
} else if (temp & SMBHSTSTS_DEV_ERR) { } else if (temp & SMBHSTSTS_DEV_ERR) {
result = -ENXIO; result = -ENXIO;
dev_dbg(&I801_dev->dev, "Error: no response!\n"); dev_dbg(&I801_dev->dev, "Error: no response!\n");
......
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