summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-02-10 03:11:14 -0500
committerWolfram Sang <wsa@the-dreams.de>2015-03-15 05:22:38 -0400
commit63d51e591931b878be7a16dacb37868a1e7ae8d1 (patch)
tree8f004a77693c477d5b157ebac54224379e052ad2 /drivers/i2c
parente2efb89768aebb93d3fa804bc6ee05888097797b (diff)
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')
-rw-r--r--drivers/i2c/busses/i2c-designware-core.c3
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 6e25c010e690..6f19a33773fe 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)
656 i2c_dw_xfer_init(dev); 656 i2c_dw_xfer_init(dev);
657 657
658 /* wait for tx to complete */ 658 /* wait for tx to complete */
659 ret = wait_for_completion_timeout(&dev->cmd_complete, HZ); 659 if (!wait_for_completion_timeout(&dev->cmd_complete, HZ)) {
660 if (ret == 0) {
661 dev_err(dev->dev, "controller timed out\n"); 660 dev_err(dev->dev, "controller timed out\n");
662 /* i2c_dw_init implicitly disables the adapter */ 661 /* i2c_dw_init implicitly disables the adapter */
663 i2c_dw_init(dev); 662 i2c_dw_init(dev);