Changeset 5687 for lm-sensors/branches

Timestamp:

03/18/09 10:33:04 (3 years ago)

Author:

khali

Message:

Patch from Roel Kluin, backported from Linux 2.6.
With a postfix decrement these timeouts reach -1 rather than 0, but
after the loop it is tested whether they have become 0.

As pointed out by Jean Delvare, the condition we are waiting for should
also be tested before the timeout. With the current order, you could
exit with a timeout error while the job is actually done.

Location:

lm-sensors/branches/lm-sensors-2.10

Files:

• CHANGES (modified) (1 diff)
• kernel/busses/i2c-amd8111.c (modified) (2 diffs)

lm-sensors/branches/lm-sensors-2.10/CHANGES

@@ -5 +5 @@
   File lm_sensors.lsm: Delete, don't advertise a legacy branch
   File doc/developers/release_checklist: Skip mail to lsm
+  Module i2c-amd8111: Fix timeout handling (2.6 backport)
   Module it87: Properly decode -128 degrees C (2.6 backport)
   Program sensors-detect: Fix detection of older DS1621

lm-sensors/branches/lm-sensors-2.10/kernel/busses/i2c-amd8111.c

@@ -80 +80 @@
         int timeout = 500;
 
-        while (timeout-- && (inb(smbus->base + AMD_EC_SC) & AMD_EC_SC_IBF))
+        while ((inb(smbus->base + AMD_EC_SC) & AMD_EC_SC_IBF) && --timeout)
                 udelay(1);
 
@@ -95 +95 @@
         int timeout = 500;
 
-        while (timeout-- && (~inb(smbus->base + AMD_EC_SC) & AMD_EC_SC_OBF))
+        while ((~inb(smbus->base + AMD_EC_SC) & AMD_EC_SC_OBF) && --timeout)
                 udelay(1);