Skip to content

Commit

Permalink
i2c-i801: Properly report bus arbitration loss
Browse files Browse the repository at this point in the history
Bit BUS_ERR of the status register means that the ICH host controller
lost the arbitration. Report this event as such.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
Jean Delvare authored and Jean Delvare committed Jul 14, 2008
1 parent 90df2cb commit dcb5c92
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/i2c/busses/i2c-i801.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit dcb5c92

Please sign in to comment.