i2c: sh_mobile: use proper type for timeout
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Sat, 20 Jun 2015 19:03:22 +0000 (21:03 +0200)
committerWolfram Sang <wsa@the-dreams.de>
Tue, 23 Jun 2015 17:50:27 +0000 (19:50 +0200)
wait_event_timeout returns long, not int.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-sh_mobile.c

index 5490bfb58f3e8008cf75b9f8010cf83e14363ec3..47659a925e09cd5f8f7ebb7b928c2d6b8699bc4a 100644 (file)
@@ -730,7 +730,8 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter,
        struct sh_mobile_i2c_data *pd = i2c_get_adapdata(adapter);
        struct i2c_msg  *msg;
        int err = 0;
-       int i, k;
+       int i;
+       long timeout;
 
        activate_ch(pd);
 
@@ -749,10 +750,10 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter,
                        i2c_op(pd, OP_START, 0);
 
                /* The interrupt handler takes care of the rest... */
-               k = wait_event_timeout(pd->wait,
+               timeout = wait_event_timeout(pd->wait,
                                       pd->sr & (ICSR_TACK | SW_DONE),
                                       adapter->timeout);
-               if (!k) {
+               if (!timeout) {
                        dev_err(pd->dev, "Transfer request timed out\n");
                        if (pd->dma_direction != DMA_NONE)
                                sh_mobile_i2c_cleanup_dma(pd);