|
@@ -183,7 +183,7 @@ static irqreturn_t octeon_i2c_isr(int irq, void *dev_id)
|
|
|
struct octeon_i2c *i2c = dev_id;
|
|
|
|
|
|
octeon_i2c_int_disable(i2c);
|
|
|
- wake_up_interruptible(&i2c->queue);
|
|
|
+ wake_up(&i2c->queue);
|
|
|
|
|
|
return IRQ_HANDLED;
|
|
|
}
|
|
@@ -206,9 +206,9 @@ static int octeon_i2c_wait(struct octeon_i2c *i2c)
|
|
|
|
|
|
octeon_i2c_int_enable(i2c);
|
|
|
|
|
|
- result = wait_event_interruptible_timeout(i2c->queue,
|
|
|
- octeon_i2c_test_iflg(i2c),
|
|
|
- i2c->adap.timeout);
|
|
|
+ result = wait_event_timeout(i2c->queue,
|
|
|
+ octeon_i2c_test_iflg(i2c),
|
|
|
+ i2c->adap.timeout);
|
|
|
|
|
|
octeon_i2c_int_disable(i2c);
|
|
|
|