Commit 63d51e59 authored Feb 10, 2015 by Nicholas Mc Guire Committed by Wolfram Sang Mar 15, 2015

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>

parent e2efb897

drivers/i2c/busses/i2c-designware-core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);