diff options
author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-02-10 03:11:14 -0500 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2015-03-15 10:22:38 +0100 |
commit | 63d51e591931b878be7a16dacb37868a1e7ae8d1 (patch) | |
tree | 8f004a77693c477d5b157ebac54224379e052ad2 /drivers/i2c/busses/i2c-designware-core.c | |
parent | e2efb89768aebb93d3fa804bc6ee05888097797b (diff) | |
download | op-kernel-dev-63d51e591931b878be7a16dacb37868a1e7ae8d1.zip op-kernel-dev-63d51e591931b878be7a16dacb37868a1e7ae8d1.tar.gz |
i2c: designware: fixup return handling of wait_for_completion_timeout
return type of wait_for_completion_timeout is unsigned long not int, rather
than introducing a new variable the wait_for_completion_timeout is moved
into the if condition as the return value is only used to detect timeout.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-core.c')
-rw-r--r-- | drivers/i2c/busses/i2c-designware-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c index 6e25c01..6f19a33 100644 --- a/drivers/i2c/busses/i2c-designware-core.c +++ b/drivers/i2c/busses/i2c-designware-core.c @@ -656,8 +656,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) i2c_dw_xfer_init(dev); /* wait for tx to complete */ - ret = wait_for_completion_timeout(&dev->cmd_complete, HZ); - if (ret == 0) { + if (!wait_for_completion_timeout(&dev->cmd_complete, HZ)) { dev_err(dev->dev, "controller timed out\n"); /* i2c_dw_init implicitly disables the adapter */ i2c_dw_init(dev); |