Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[karo-tx-linux.git] / drivers / i2c / busses / i2c-octeon.c

diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c
index 935585ef4d3996a9ccc482dd4ca1f62719a5fa4a..956fe320f313d84c4a0371c32d858192ad7742f1 100644 (file)
--- a/drivers/i2c/busses/i2c-octeon.c
+++ b/drivers/i2c/busses/i2c-octeon.c
@@ -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);
 
@@ -440,7 +440,7 @@ static struct i2c_adapter octeon_i2c_ops = {
        .owner = THIS_MODULE,
        .name = "OCTEON adapter",
        .algo = &octeon_i2c_algo,
-       .timeout = 2,
+       .timeout = HZ / 50,
 };
 
 /**