Changeset 4059

Timestamp:

06/23/06 20:39:51 (2 years ago)

Author:

khali

Message:

i2c-i801: Fix block transaction poll loops

Two of the three poll loops have the poll and sleep swapped,
causing an extra sleep to occur after the polled condition is
fulfilled. In practice, this doubles the amount of sleep time for
every block transaction.

Files:

• lm-sensors/trunk/CHANGES (modified) (1 diff)
• lm-sensors/trunk/kernel/busses/i2c-i801.c (modified) (2 diffs)

lm-sensors/trunk/CHANGES

@@ -17 +17 @@
-  Module i2c-i801: Disable PEC mode after every transaction (2.6 backport)
-                   Add ICH8 support (2.6 backport)
+                   Fix block transaction poll loops (2.6 backport)
-  Module i2c-nforce2: Add nForce4 MCP51, MCP55 support (2.6 backport)
-  Module i2c-piix4: Add ServerWorks HT-1000 support (2.6 backport)

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

@@ -394 +394 @@
-                timeout = 0;
-                do {
+                        i2c_delay(1);
-                        temp = inb_p(SMBHSTSTS);
-                        i2c_delay(1);
-                }
-                    while ((!(temp & 0x80))
@@ -458 +458 @@
-                timeout = 0;
-                do {
+                        i2c_delay(1);
-                        temp = inb_p(SMBHSTSTS);
-                        i2c_delay(1);
-                } while ((!(temp & 0x02))
-                           && (timeout++ < MAX_TIMEOUT));