i2c: ismt: fix type of return var of wait_for_completion_timeout
authorNicholas Mc Guire <hofrat@osadl.org>
Sun, 8 Feb 2015 08:03:30 +0000 (03:03 -0500)
committerWolfram Sang <wsa@the-dreams.de>
Sun, 15 Mar 2015 09:50:02 +0000 (10:50 +0100)
return type of wait_for_completion_timeout is unsigned long not int. As
ret is in used for other calls a new appropriately typed variable timeout
is added to handle wait_for_completion_timeout

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-ismt.c

index f2b0ff011631c9e920e042a1ec79b0b98126eb5b..f994712d0904733782e6804c20bd7ad47eaffb94 100644 (file)
@@ -380,6 +380,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr,
                       int size, union i2c_smbus_data *data)
 {
        int ret;
+       unsigned long time_left;
        dma_addr_t dma_addr = 0; /* address of the data buffer */
        u8 dma_size = 0;
        enum dma_data_direction dma_direction = 0;
@@ -578,13 +579,13 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr,
        ismt_submit_desc(priv);
 
        /* Now we wait for interrupt completion, 1s */
-       ret = wait_for_completion_timeout(&priv->cmp, HZ*1);
+       time_left = wait_for_completion_timeout(&priv->cmp, HZ*1);
 
        /* unmap the data buffer */
        if (dma_size != 0)
                dma_unmap_single(&adap->dev, dma_addr, dma_size, dma_direction);
 
-       if (unlikely(!ret)) {
+       if (unlikely(!time_left)) {
                dev_err(dev, "completion wait timed out\n");
                ret = -ETIMEDOUT;
                goto out;