evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

i2c: mxs: match wait_for_completion_timeout return type

Browse source 
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>
This commit is contained in:
Nicholas Mc Guire 2015-03-10 14:08:13 -04:00 • committed by Wolfram Sang
parent 9ed1d862d7
commit 271a89cdd6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/i2c/busses/i2c-mxs.c
View file

@ -568,6 +568,7 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg,
int ret; int ret;
int flags; int flags;
int use_pio = 0; int use_pio = 0;
unsigned long time_left;
flags = stop ? MXS_I2C_CTRL0_POST_SEND_STOP : 0; 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) if (ret)
return ret; return ret;
ret = wait_for_completion_timeout(&i2c->cmd_complete, time_left = wait_for_completion_timeout(&i2c->cmd_complete,
msecs_to_jiffies(1000)); msecs_to_jiffies(1000));
if (ret == 0) if (!time_left)
goto timeout; goto timeout;
ret = i2c->cmd_err; ret = i2c->cmd_err;