Properly report bus arbitration lost.

Backport from Linux 2.6.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5307 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2008-07-15 21:09:38 +00:00
1 parent 9a166de2c2
commit 20c2b6de11
2 files changed
+3 -4

No files matched your search

+1
View File
@@ -4,6 +4,7 @@ lm_sensors CHANGES file
SVN-HEAD
Library: Avoid namespace pollution
Module i2c-i801: Remove verbose debugging messages (2.6 backport)
Properly report bus arbitration lost (2.6 backport)
Module i2c-piix4: Minor cleanups (2.6 backport)
Program sensors-detect: Add VIA VT1212 support
Add SMSC EMC2700LPC support
+2 -4
View File
@@ -290,9 +290,7 @@ static int i801_transaction(void)
if (temp & 0x08) {
result = -1;
dev_err(I801_dev, "Bus collision! SMBus may be locked "
"until next hard reset. (sorry!)\n");
/* Clock stops and slave is stuck in mid-transmission */
dev_err(I801_dev, "Lost arbitration\n");
}
if (temp & 0x04) {
@@ -405,7 +403,7 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write,
"Error: Failed bus transaction\n");
} else if (temp & 0x08) {
result = -1;
dev_err(I801_dev, "Bus collision!\n");
dev_err(I801_dev, "Lost arbitration\n");
} else if (temp & 0x04) {
result = -1;
dev_dbg(I801_dev, "Error: no response!\n");