diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-17 18:05:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-17 18:05:26 -0500 |
| commit | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (patch) | |
| tree | 88431185f839d44a92dae9a58adba30d9be65aea /drivers/i2c/busses/i2c-cpm.c | |
| parent | 0bc77ecbe4f69ff8ead1d2abfe84ca9ba2a7bca4 (diff) | |
| parent | be44f01e8af3862767f466f89c12640a2f2b0038 (diff) | |
Merge branch 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
* 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux:
i2c-s3c2410: fix check for being in suspend.
i2c-cpm: Detect and report NAK right away instead of timing out
Diffstat (limited to 'drivers/i2c/busses/i2c-cpm.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-cpm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index 228f75723063..3fcf78e906db 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c | |||
| @@ -365,6 +365,7 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) | |||
| 365 | pmsg = &msgs[tptr]; | 365 | pmsg = &msgs[tptr]; |
| 366 | if (pmsg->flags & I2C_M_RD) | 366 | if (pmsg->flags & I2C_M_RD) |
| 367 | ret = wait_event_interruptible_timeout(cpm->i2c_wait, | 367 | ret = wait_event_interruptible_timeout(cpm->i2c_wait, |
| 368 | (in_be16(&tbdf[tptr].cbd_sc) & BD_SC_NAK) || | ||
| 368 | !(in_be16(&rbdf[rptr].cbd_sc) & BD_SC_EMPTY), | 369 | !(in_be16(&rbdf[rptr].cbd_sc) & BD_SC_EMPTY), |
| 369 | 1 * HZ); | 370 | 1 * HZ); |
| 370 | else | 371 | else |