From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934200AbcHaN3G (ORCPT ); Wed, 31 Aug 2016 09:29:06 -0400 Received: from nat-hk.nvidia.com ([203.18.50.4]:33210 "EHLO hkmmgate101.nvidia.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934018AbcHaN3D (ORCPT ); Wed, 31 Aug 2016 09:29:03 -0400 X-PGP-Universal: processed; by hkpgpgate102.nvidia.com on Wed, 31 Aug 2016 06:28:59 -0700 From: Shardar Shariff Md To: , , , , , , , , , Subject: [PATCH v11 2/5] i2c: tegra: If fifo flush fails return error Date: Wed, 31 Aug 2016 18:58:41 +0530 Message-ID: <1472650124-5702-2-git-send-email-smohammed@nvidia.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1472650124-5702-1-git-send-email-smohammed@nvidia.com> References: <1472650124-5702-1-git-send-email-smohammed@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org During i2c controller initialization, when fifo flush fails return error instead of returning the error during exit. Signed-off-by: Shardar Shariff Md --- Changes in v11: - Fix smatch error for below warning tegra_i2c_init warn: unused return: err = tegra_i2c_flush_fifos() --- --- drivers/i2c/busses/i2c-tegra.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index e93c72a..07a39b7 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -494,6 +494,8 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) i2c_writel(i2c_dev, val, I2C_FIFO_CONTROL); err = tegra_i2c_flush_fifos(i2c_dev); + if (err) + goto err; if (i2c_dev->is_multimaster_mode && i2c_dev->hw->has_slcg_override_reg) i2c_writel(i2c_dev, I2C_MST_CORE_CLKEN_OVR, I2C_CLKEN_OVERRIDE); -- 1.8.1.5