Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp126656ybt; Tue, 16 Jun 2020 18:44:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPDuk3CZcsHikadLxd8rDrgETeEo8Rslwg+4SZ9da53BhOyWoWvvXdmT+YkKvC2QCUCkFS X-Received: by 2002:a17:906:7c5a:: with SMTP id g26mr5411631ejp.200.1592358253414; Tue, 16 Jun 2020 18:44:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592358253; cv=none; d=google.com; s=arc-20160816; b=TGBu7VeK8S2hIRGdW1MHzJseZp7XGO3fllyyMiX91bwpcUsnhOprRkgu0vYcOwDyOb 0kQeAJK/eOYpkGAczMWYvLZ7mZxC+MAYxFJSePEdTtOGDQPbQ0fn2gzJHHpxQMwmtKoD /qPI4BEVMXgvfFQZ7eKYytk0oklCeLRHnYg99lxQsh3QSvS3c9leorLBzDgsMm2QdbW7 UeSOjigMhzK6CJTRoFrwJkxl5qtsd9RDQSux/ufOQ24OuR232jW1m8/0T01mN2qZxTOT /z8PoryeB+sV8zyZy2tI/d8HlKypCmTvw3SxT7Iea9h1fouEYY1VRmFAiSOZEivcRBCn g3eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=6abRkuk51eYz02OURFdOxftlQrZtHyE/TdE1BX0E3mw=; b=rLj+YDDVhis9Ql8hJ6RyIZBaQ4FiUR8qHPG5L8ay2SQyQhWEWjOTV/xmdETCOS42HM Wd9HI4glDI2bhl9HdH06U06+gBs1tlyXVI0YMH8KWs2CNRgGk8+G3GAHDmt8Fd3+TMsu GFQWSTNihEuDoT/30FDeRiwqEeSlGlt7OpHRLBWmY9X+6BBtxeiWEttA05tcDaAeLL4J bApKUS0h0x9zSQLgMNyv66jpXykihS+E2HvLqOBblVVebZE5SBBnAMKazjTpo+DS4yQN UXCvAWmMyRidES45sVRlHyraQjG/G2LQ7yfpav/sbzH4oguYCQ+xybHfUheDcXVn9GM9 dp8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=avFJMyVY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id du15si16171488ejc.591.2020.06.16.18.43.51; Tue, 16 Jun 2020 18:44:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=avFJMyVY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727030AbgFQBl1 (ORCPT + 99 others); Tue, 16 Jun 2020 21:41:27 -0400 Received: from hqnvemgate24.nvidia.com ([216.228.121.143]:19551 "EHLO hqnvemgate24.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726679AbgFQBje (ORCPT ); Tue, 16 Jun 2020 21:39:34 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate24.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Tue, 16 Jun 2020 18:37:54 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Tue, 16 Jun 2020 18:39:33 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Tue, 16 Jun 2020 18:39:33 -0700 Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 17 Jun 2020 01:39:33 +0000 Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Wed, 17 Jun 2020 01:39:32 +0000 Received: from skomatineni-linux.nvidia.com (Not Verified[10.2.171.186]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Tue, 16 Jun 2020 18:39:32 -0700 From: Sowjanya Komatineni To: , , , , , , , CC: , , , , , , , Subject: [RFC PATCH v2 04/18] i2c: tegra: Fix the error path in tegra_i2c_runtime_resume Date: Tue, 16 Jun 2020 18:41:20 -0700 Message-ID: <1592358094-23459-5-git-send-email-skomatineni@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592358094-23459-1-git-send-email-skomatineni@nvidia.com> References: <1592358094-23459-1-git-send-email-skomatineni@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1592357875; bh=6abRkuk51eYz02OURFdOxftlQrZtHyE/TdE1BX0E3mw=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:X-NVConfidentiality:MIME-Version: Content-Type; b=avFJMyVYBuHGK6NEmjBP/w5n8BiEz8ZKF/4tkD8XHOS4OU1h7iFCyv8LarNHY63c5 KKn8R5vif9cX7Lce5YbJIyNH3vhSGMVv4fXUrSu5iA4Uo/4eW/RkVqcbt8HNgs4Iqs pBHLiMFWWTSk2mOtAiz9YO86V682bH9li7XcOnfLOAK6IH4GXS0PI7KcjlhE/yqm1B E0xsVOmMJV9UDl6s/I9hAdhxglxCSEy2pEu8wkpJATsCij2k1CFhhgxvBbv7DXbpGC l8/pD5mbY24yRYMUosbXi4kd2tHO0t7hXvcuzOvcTcli4OAByV+wvE1e3+sbRtk/CK LTWphNU8wp7hw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org tegra_i2c_runtime_resume does not disable prior enabled clocks properly. This patch fixes it. Signed-off-by: Sowjanya Komatineni --- drivers/i2c/busses/i2c-tegra.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 3be1018..1b459ca 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -668,7 +668,7 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev) ret = clk_enable(i2c_dev->slow_clk); if (ret < 0) { dev_err(dev, "failed to enable slow clock: %d\n", ret); - return ret; + goto disable_fast_clk; } } @@ -676,11 +676,16 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev) if (ret < 0) { dev_err(i2c_dev->dev, "Enabling div clk failed, err %d\n", ret); - clk_disable(i2c_dev->fast_clk); - return ret; + goto disable_slow_clk; } return 0; + +disable_slow_clk: + clk_disable(i2c_dev->slow_clk); +disable_fast_clk: + clk_disable(i2c_dev->fast_clk); + return ret; } static int __maybe_unused tegra_i2c_runtime_suspend(struct device *dev) -- 2.7.4