Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761235AbbBIQkb (ORCPT ); Mon, 9 Feb 2015 11:40:31 -0500 Received: from www.osadl.org ([62.245.132.105]:43827 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761186AbbBIQkT (ORCPT ); Mon, 9 Feb 2015 11:40:19 -0500 From: Nicholas Mc Guire To: Wolfram Sang Cc: Mika Westerberg , Jisheng Zhang , Du Wenkai , Shinya Kuribayashi , Romain Baeriswyl , Jarkko Nikula , Andrew Jackson , David Box , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH] i2c-designware: fixup of wait_for_completion_timeout return handling Date: Mon, 9 Feb 2015 11:35:39 -0500 Message-Id: <1423499739-9423-1-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1680 Lines: 46 return type of wait_for_completion_timeout is unsigned long not int. An appropriate return variable is introduced and assignment fixed up. Signed-off-by: Nicholas Mc Guire --- Patch was compile tested with x86_64_defconfig + CONFIG_X86_AMD_PLATFORM_DEVICE=y, CONFIG_I2C_DESIGNWARE_PLATFORM=m (implies CONFIG_I2C_DESIGNWARE_CORE=y) Patch is against 3.19.0-rc7 (localversion-next is -next-20150209) drivers/i2c/busses/i2c-designware-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c index 6e25c01..05934e0 100644 --- a/drivers/i2c/busses/i2c-designware-core.c +++ b/drivers/i2c/busses/i2c-designware-core.c @@ -623,6 +623,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) { struct dw_i2c_dev *dev = i2c_get_adapdata(adap); int ret; + unsigned int timeout; dev_dbg(dev->dev, "%s: msgs: %d\n", __func__, num); @@ -656,8 +657,8 @@ 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) { + timeout = wait_for_completion_timeout(&dev->cmd_complete, HZ); + if (timeout == 0) { dev_err(dev->dev, "controller timed out\n"); /* i2c_dw_init implicitly disables the adapter */ i2c_dw_init(dev); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/