Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932160AbcDYLpl (ORCPT ); Mon, 25 Apr 2016 07:45:41 -0400 Received: from nat-hk.nvidia.com ([203.18.50.4]:28864 "EHLO hkmmgate101.nvidia.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754298AbcDYLpj (ORCPT ); Mon, 25 Apr 2016 07:45:39 -0400 X-PGP-Universal: processed; by hkpgpgate102.nvidia.com on Mon, 25 Apr 2016 04:45:37 -0700 From: Shardar Shariff Md To: , , , , , , , , CC: Shardar Shariff Md Subject: [PATCH v5 1/4] i2c: tegra: disable clock before returning error Date: Mon, 25 Apr 2016 17:15:15 +0530 Message-ID: <1461584718-23217-1-git-send-email-smohammed@nvidia.com> X-Mailer: git-send-email 1.8.1.5 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 Content-Length: 947 Lines: 41 Disable clock before returning error in tegra_i2c_init() Signed-off-by: Shardar Shariff Md --- Changes since v1: - Move current patch as separate patch --- drivers/i2c/busses/i2c-tegra.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index d764d64..e8507f6 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -483,19 +483,21 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) if (time_after(jiffies, timeout)) { dev_warn(i2c_dev->dev, "timeout waiting for config load\n"); - return -ETIMEDOUT; + err = -ETIMEDOUT; + goto err; } msleep(1); } } - tegra_i2c_clock_disable(i2c_dev); if (i2c_dev->irq_disabled) { i2c_dev->irq_disabled = 0; enable_irq(i2c_dev->irq); } +err: + tegra_i2c_clock_disable(i2c_dev); return err; } -- 1.8.1.5