Changeset 5307

Show
Ignore:
Timestamp:
07/15/08 23:09:38 (1 month ago)
Author:
khali
Message:

Properly report bus arbitration lost.
Backport from Linux 2.6.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lm-sensors/trunk/CHANGES

    r5306 r5307  
    55  Library: Avoid namespace pollution 
    66  Module i2c-i801: Remove verbose debugging messages (2.6 backport) 
     7                   Properly report bus arbitration lost (2.6 backport) 
    78  Module i2c-piix4: Minor cleanups (2.6 backport) 
    89  Program sensors-detect: Add VIA VT1212 support 

  • lm-sensors/trunk/kernel/busses/i2c-i801.c

    r5306 r5307  
    291291        if (temp & 0x08) { 
    292292                result = -1; 
    293                 dev_err(I801_dev, "Bus collision! SMBus may be locked " 
    294                         "until next hard reset. (sorry!)\n"); 
    295                 /* Clock stops and slave is stuck in mid-transmission */ 
     293                dev_err(I801_dev, "Lost arbitration\n"); 
    296294        } 
    297295 
    …… 
    406404                } else if (temp & 0x08) { 
    407405                        result = -1; 
    408                         dev_err(I801_dev, "Bus collision!\n"); 
     406                        dev_err(I801_dev, "Lost arbitration\n"); 
    409407                } else if (temp & 0x04) { 
    410408                        result = -1;