diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-24 05:04:08 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-24 05:04:08 -0500 |
| commit | 7645c4bfbb36f357f03815f5729c46ce8d89f008 (patch) | |
| tree | eb2c45bbdfc715a9a6e96e6af9675a0440ef8ff1 /drivers/i2c/busses/i2c-cpm.c | |
| parent | 74b7ff48a93f44198ac03cc4e628d713f53d4668 (diff) | |
| parent | 574f3c4f5c55e99ea60f71fd98cc54931d4b2eae (diff) | |
Merge branch 'fix/hda' into topic/hda
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 |