Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp156487ybh; Tue, 14 Jul 2020 21:23:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbCPODLwLH3roJ+GlaVnOQvZR6Z5qAevVRD32Nddc/m7+t4gNzNowN7Gp8Kfi0iVeR1Xoy X-Received: by 2002:a05:6402:b4b:: with SMTP id bx11mr7628287edb.286.1594787031209; Tue, 14 Jul 2020 21:23:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594787031; cv=none; d=google.com; s=arc-20160816; b=ntrCVlcmM/Y36nZy90ASbc4q7J7BIVSLHXELkASZkxInxg120VF9rVih9lWswyAN8Q dFl5edVUlu2oarvpg3UMgcFnujgghOHsX57cmp1E0x1Cu7KW6ch/pY9J5i1MD8fZq8Yb H/ScPvlHXVmG4TzRO0+Z/Zq+WzK7hf+bMupC+5YNpmN0NssK0bAiCcUH0WOL7bP5/Zxf mGrSKLq+kKkd6kbUYCk3I2vOeyddDvw/rFLlbpbOeoxDkuS9EXgQSx6oHmIRR5zU+a58 yeS0XDW2UJVPWWzvW6TbdVkUwOaXVz5qi+T8++kGEvlbz2vYJDu6l6ri2ajb06pgzSRT duvA== 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=eufXsoZ14WkRUf36lqjK6lfwNSwXZDr32mhUx6fHlSE=; b=LHBhaLiRvU6d2Ff8SAyf7wlqpgSd4LlTaBjF6O1t+CRnxhaShWzKt0zpLOXbhWSVqH /3vev/qSiXpBBv+erDGDgllrRUTUBSYLza8utVdtz0zZrtjfT22Jmi2HosizxdLUavqb VJQpdrGvoUuwJt3JWArn4cov85mFJJAXZXoQ2t/pmBASLR0wzNuJTgciUNo3ITblXZCF npqtz2r9BqZfNtk3SirJV1CRmPLuR2LoAX4k7ejTwLxXgHfnmfGS6DFiRyJGHG2SrBeM pft2FPoTmXP5d6wMbrV5KCGVzW2t5pz4+74g6ObMvfaqY5bQesa7+eei6o5eeBa41N9w TxiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=O8tYkUqr; 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 ck9si498756edb.560.2020.07.14.21.23.28; Tue, 14 Jul 2020 21:23:51 -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=O8tYkUqr; 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 S1728220AbgGOETa (ORCPT + 99 others); Wed, 15 Jul 2020 00:19:30 -0400 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:11970 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728163AbgGOET2 (ORCPT ); Wed, 15 Jul 2020 00:19:28 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Tue, 14 Jul 2020 21:18:29 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Tue, 14 Jul 2020 21:19:27 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Tue, 14 Jul 2020 21:19:27 -0700 Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 15 Jul 2020 04:19:27 +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, 15 Jul 2020 04:19:27 +0000 Received: from skomatineni-linux.nvidia.com (Not Verified[10.2.160.169]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Tue, 14 Jul 2020 21:19:26 -0700 From: Sowjanya Komatineni To: , , , , , , , CC: , , , , , , , Subject: [RFC PATCH v3 05/18] i2c: tegra: Fix the error path in tegra_i2c_runtime_resume Date: Tue, 14 Jul 2020 21:20:42 -0700 Message-ID: <1594786855-26506-6-git-send-email-skomatineni@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1594786855-26506-1-git-send-email-skomatineni@nvidia.com> References: <1594786855-26506-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=1594786709; bh=eufXsoZ14WkRUf36lqjK6lfwNSwXZDr32mhUx6fHlSE=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:X-NVConfidentiality:MIME-Version: Content-Type; b=O8tYkUqrbIYTKjoF52jmmh2bSQejoxqlnbuovv0mgrgzo6II8YlzvPYBAd0qpzXYx 4Mr2rH0cYU1CUEdI8Mw1loF0qCOKI9IWt3BBBfH9UsyWUTbXP2jZ93HxjLYKBYTQGp 1dt48ep7L7N3fUlZBxlrbNaPSQ+IMC7aLlVtDLsbpaWh8K7hzTJD46eVpLiNuKvqt5 4HOLZujS5elgYo/gRqoTSfHnz49xnCiWHsszGroWL58455IvYUe2TzUlXYafSgEYmD Zn6VVASBbNixVKNCdWXlcfOYzne+uo02TVeL/Q46nSJeS/Ksqpqm+si36vMyQXnecE Phybz8I+sRNyA== 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 c91307b9..7b93c45 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -665,18 +665,23 @@ 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; } ret = clk_enable(i2c_dev->div_clk); 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