diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:12 -0400 |
| commit | 62d170290979e0bb805d969cca4ea852bdd45260 (patch) | |
| tree | 837372297501a2d144358b44e7db3f88c5612aa2 /drivers/i2c/algos | |
| parent | 8b5b94e4e9813cdd77103827f48d58c806ab45c6 (diff) | |
| parent | d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: We need the x86/uv updates from upstream, to queue up
dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/i2c/algos')
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-pca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c index f68e5f8e23ee..6318f7ddc1d4 100644 --- a/drivers/i2c/algos/i2c-algo-pca.c +++ b/drivers/i2c/algos/i2c-algo-pca.c | |||
| @@ -190,7 +190,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap, | |||
| 190 | int completed = 1; | 190 | int completed = 1; |
| 191 | unsigned long timeout = jiffies + i2c_adap->timeout; | 191 | unsigned long timeout = jiffies + i2c_adap->timeout; |
| 192 | 192 | ||
| 193 | while (pca_status(adap) != 0xf8) { | 193 | while ((state = pca_status(adap)) != 0xf8) { |
| 194 | if (time_before(jiffies, timeout)) { | 194 | if (time_before(jiffies, timeout)) { |
| 195 | msleep(10); | 195 | msleep(10); |
| 196 | } else { | 196 | } else { |