diff options
| -rw-r--r-- | drivers/i2c/busses/i2c-cadence.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c index 7d7a14cdadfb..2ee78e099d30 100644 --- a/drivers/i2c/busses/i2c-cadence.c +++ b/drivers/i2c/busses/i2c-cadence.c | |||
| @@ -475,7 +475,7 @@ static void cdns_i2c_master_reset(struct i2c_adapter *adap) | |||
| 475 | static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg, | 475 | static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg, |
| 476 | struct i2c_adapter *adap) | 476 | struct i2c_adapter *adap) |
| 477 | { | 477 | { |
| 478 | int ret; | 478 | unsigned long time_left; |
| 479 | u32 reg; | 479 | u32 reg; |
| 480 | 480 | ||
| 481 | id->p_msg = msg; | 481 | id->p_msg = msg; |
| @@ -501,8 +501,8 @@ static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg, | |||
| 501 | cdns_i2c_msend(id); | 501 | cdns_i2c_msend(id); |
| 502 | 502 | ||
| 503 | /* Wait for the signal of completion */ | 503 | /* Wait for the signal of completion */ |
| 504 | ret = wait_for_completion_timeout(&id->xfer_done, adap->timeout); | 504 | time_left = wait_for_completion_timeout(&id->xfer_done, adap->timeout); |
| 505 | if (!ret) { | 505 | if (time_left == 0) { |
| 506 | cdns_i2c_master_reset(adap); | 506 | cdns_i2c_master_reset(adap); |
| 507 | dev_err(id->adap.dev.parent, | 507 | dev_err(id->adap.dev.parent, |
| 508 | "timeout waiting on completion\n"); | 508 | "timeout waiting on completion\n"); |
