aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/i2c-cpm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index b5db8b883615..9c2e10082b79 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -140,7 +140,7 @@ static irqreturn_t cpm_i2c_interrupt(int irq, void *dev_id)
140 140
141 dev_dbg(&adap->dev, "Interrupt: %x\n", i); 141 dev_dbg(&adap->dev, "Interrupt: %x\n", i);
142 142
143 wake_up_interruptible(&cpm->i2c_wait); 143 wake_up(&cpm->i2c_wait);
144 144
145 return i ? IRQ_HANDLED : IRQ_NONE; 145 return i ? IRQ_HANDLED : IRQ_NONE;
146} 146}
@@ -364,12 +364,12 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
364 dev_dbg(&adap->dev, "test ready.\n"); 364 dev_dbg(&adap->dev, "test ready.\n");
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_timeout(cpm->i2c_wait,
368 (in_be16(&tbdf[tptr].cbd_sc) & BD_SC_NAK) || 368 (in_be16(&tbdf[tptr].cbd_sc) & BD_SC_NAK) ||
369 !(in_be16(&rbdf[rptr].cbd_sc) & BD_SC_EMPTY), 369 !(in_be16(&rbdf[rptr].cbd_sc) & BD_SC_EMPTY),
370 1 * HZ); 370 1 * HZ);
371 else 371 else
372 ret = wait_event_interruptible_timeout(cpm->i2c_wait, 372 ret = wait_event_timeout(cpm->i2c_wait,
373 !(in_be16(&tbdf[tptr].cbd_sc) & BD_SC_READY), 373 !(in_be16(&tbdf[tptr].cbd_sc) & BD_SC_READY),
374 1 * HZ); 374 1 * HZ);
375 if (ret == 0) { 375 if (ret == 0) {