Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/i2c/busses/i2c-i801.c

+4 −6
Original line number Diff line number Diff line
@@ -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");