From patchwork Wed Aug 31 13:22:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shardar Shariff Md X-Patchwork-Id: 664533 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sPR0361MKz9sCj for ; Wed, 31 Aug 2016 23:22:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759256AbcHaNW6 (ORCPT ); Wed, 31 Aug 2016 09:22:58 -0400 Received: from nat-hk.nvidia.com ([203.18.50.4]:44053 "EHLO hkmmgate102.nvidia.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751128AbcHaNW5 (ORCPT ); Wed, 31 Aug 2016 09:22:57 -0400 Received: from hkpgpgate102.nvidia.com (Not Verified[10.18.92.9]) by hkmmgate102.nvidia.com id ; Wed, 31 Aug 2016 21:21:46 +0800 Received: from HKMAIL101.nvidia.com ([10.18.67.137]) by hkpgpgate102.nvidia.com (PGP Universal service); Wed, 31 Aug 2016 06:22:53 -0700 X-PGP-Universal: processed; by hkpgpgate102.nvidia.com on Wed, 31 Aug 2016 06:22:53 -0700 Received: from DRBGMAIL103.nvidia.com (10.18.16.22) by HKMAIL101.nvidia.com (10.18.16.10) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Wed, 31 Aug 2016 13:22:51 +0000 Received: from HQMAIL101.nvidia.com (172.20.187.10) by DRBGMAIL103.nvidia.com (10.18.16.22) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Wed, 31 Aug 2016 13:22:49 +0000 Received: from shardar-build-machine.nvidia.com (172.20.13.39) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Wed, 31 Aug 2016 13:22:46 +0000 From: Shardar Shariff Md To: , , , , , , , , Subject: [PATCH 2/5] i2c: tegra: If fifo flush fails return error Date: Wed, 31 Aug 2016 18:52:35 +0530 Message-ID: <1472649758-5608-2-git-send-email-smohammed@nvidia.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1472649758-5608-1-git-send-email-smohammed@nvidia.com> References: <1472649758-5608-1-git-send-email-smohammed@nvidia.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@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);