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

i2c: cadence: fixup wait_for_completion_timeout return handling

Browse source 
return type of wait_for_completion_timeout is unsigned long not int. The
return variable is renamed to make the timeout condition clearly readable
and the type adjusted to unsigned long.

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-02-10 11:55:10 -05:00 • committed by Wolfram Sang
parent bd9dd73c6a
commit e2efb89768
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/i2c/busses/i2c-cadence.c
View file

@ -475,7 +475,7 @@ static void cdns_i2c_master_reset(struct i2c_adapter *adap)
static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg, static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg,
struct i2c_adapter *adap) struct i2c_adapter *adap)
{ {
int ret; unsigned long time_left;
u32 reg; u32 reg;
id->p_msg = msg; id->p_msg = msg;
@ -501,8 +501,8 @@ static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg,
cdns_i2c_msend(id); cdns_i2c_msend(id);
/* Wait for the signal of completion */ /* Wait for the signal of completion */
ret = wait_for_completion_timeout(&id->xfer_done, adap->timeout); time_left = wait_for_completion_timeout(&id->xfer_done, adap->timeout);
if (!ret) { if (time_left == 0) {
cdns_i2c_master_reset(adap); cdns_i2c_master_reset(adap);
dev_err(id->adap.dev.parent, dev_err(id->adap.dev.parent,
"timeout waiting on completion\n"); "timeout waiting on completion\n");