From 20c2b6de119e960d9d60b5c9511541a145987f0a Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 15 Jul 2008 21:09:38 +0000 Subject: [PATCH] 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 --- CHANGES | 1 + kernel/busses/i2c-i801.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 7f17d165..67deb4be 100644 --- a/CHANGES +++ b/CHANGES @@ -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 diff --git a/kernel/busses/i2c-i801.c b/kernel/busses/i2c-i801.c index e71544b2..21918ba1 100644 --- a/kernel/busses/i2c-i801.c +++ b/kernel/busses/i2c-i801.c @@ -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");