]> git.karo-electronics.de Git - linux-beck.git/commitdiff
i2c: mxs: match wait_for_completion_timeout return type
authorNicholas Mc Guire <hofrat@osadl.org>
Tue, 10 Mar 2015 18:08:13 +0000 (14:08 -0400)
committerWolfram Sang <wsa@the-dreams.de>
Sun, 15 Mar 2015 09:14:10 +0000 (10:14 +0100)
Return type of wait_for_completion_timeout is unsigned long not int.
An appropriately named unsigned long is added and the assignment fixed up.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-mxs.c

index ff8b12c8d25f50d88beda7e47a0d7d8dbc334e24..56fceff6ba1422eb5eb3b0d32f1835a489925c28 100644 (file)
@@ -568,6 +568,7 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg,
        int ret;
        int flags;
        int use_pio = 0;
+       unsigned long time_left;
 
        flags = stop ? MXS_I2C_CTRL0_POST_SEND_STOP : 0;
 
@@ -599,9 +600,9 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg,
                if (ret)
                        return ret;
 
-               ret = wait_for_completion_timeout(&i2c->cmd_complete,
+               time_left = wait_for_completion_timeout(&i2c->cmd_complete,
                                                msecs_to_jiffies(1000));
-               if (ret == 0)
+               if (!time_left)
                        goto timeout;
 
                ret = i2c->cmd_err;