diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-28 18:36:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-28 18:36:58 -0500 |
| commit | 18963caaf55240d6a0491bdb27b7fef2882ffb15 (patch) | |
| tree | d0e4365cae0ce401ba826809f4eef0bd755f4f2d /drivers/i2c/busses/i2c-amd8111.c | |
| parent | 98f8948f13b4d27c3695c49ac9a970a77166f9ee (diff) | |
| parent | 778ef1e6cbb049c9bcbf405936ee6f2b6e451892 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/i2c/busses/i2c-amd8111.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-amd8111.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c index edab51973bf5..a7c59908c457 100644 --- a/drivers/i2c/busses/i2c-amd8111.c +++ b/drivers/i2c/busses/i2c-amd8111.c | |||
| @@ -72,7 +72,7 @@ static unsigned int amd_ec_wait_write(struct amd_smbus *smbus) | |||
| 72 | { | 72 | { |
| 73 | int timeout = 500; | 73 | int timeout = 500; |
| 74 | 74 | ||
| 75 | while (timeout-- && (inb(smbus->base + AMD_EC_SC) & AMD_EC_SC_IBF)) | 75 | while ((inb(smbus->base + AMD_EC_SC) & AMD_EC_SC_IBF) && --timeout) |
| 76 | udelay(1); | 76 | udelay(1); |
| 77 | 77 | ||
| 78 | if (!timeout) { | 78 | if (!timeout) { |
| @@ -88,7 +88,7 @@ static unsigned int amd_ec_wait_read(struct amd_smbus *smbus) | |||
| 88 | { | 88 | { |
| 89 | int timeout = 500; | 89 | int timeout = 500; |
| 90 | 90 | ||
| 91 | while (timeout-- && (~inb(smbus->base + AMD_EC_SC) & AMD_EC_SC_OBF)) | 91 | while ((~inb(smbus->base + AMD_EC_SC) & AMD_EC_SC_OBF) && --timeout) |
| 92 | udelay(1); | 92 | udelay(1); |
| 93 | 93 | ||
| 94 | if (!timeout) { | 94 | if (!timeout) { |