Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1734418ybh; Thu, 23 Jul 2020 16:50:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBbp/um8msZ8pHLT5DBYPD3rfMtLpTNe4bZX+QHZaYgWOvwqsIa2oo86Eh//ZGLa86BTdr X-Received: by 2002:a05:6402:c06:: with SMTP id co6mr6520970edb.142.1595548227379; Thu, 23 Jul 2020 16:50:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595548227; cv=none; d=google.com; s=arc-20160816; b=XPfOLjGaE3MCObkQrNvHBHMLBeZ/0uOFAtJSfrNw2R9F1JPwjXDqzNY10Bble0hBiw pLPL9/ewag62pLvsGioTkvqhC3wrguQRGIjzcXh5KjAj8NI1bnWKi8xjX+0d0ZCiQP54 Kh571222J249jOYcYQq33264o9S991+kzD0cCfPifMx4eajLCDAydkQgqt1OFB9j/KN/ Y1NeMQgur63wvcW7b85gVFoSgfa61VnvrQeQHbJbyG7DUJ9HQwyUox5VgkX1DmKHEBvN RJEVfVegPG1+jrqCnEPPVtOjLeB3KzxgOqg+gQ4eIqaKhuJ/wADi22bCMcHBI1fKb8iK VL9A== 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=x/hhuUWtp0hTKp75/+TX0+5TCihRDVCX4GzT4Q+2Df5oMWXbcAjdSHAsAFw5RgN7SQ aOWVXCtm7NwohbaB6ByL271TkxKrsWmCHenwtnH/0gcI9u8TfrCHhakXgidyEiPItL/z OEPmP9nsiRgUKs51zNfSbLyE8jWZqOs+3YEDUvMRP5Y2+44ijeManYEX0Gw/A6gzH5cv s5GFhsqSvNaQ/zH4FJLQqHUrygZWcrTjmf27Y8owfQNg2zuh2AJzR268DpXcUSg3Cjpt 9qftEH4BuM2ARXC6W2z9nG8fYL8Jv38poqGbzRIJ0Wi6EhZIKATp5o4WdpzqJavOoWfP WQgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=GyJ1vhtq; 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 c8si2742216eds.379.2020.07.23.16.50.05; Thu, 23 Jul 2020 16:50:27 -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=GyJ1vhtq; 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 S1728383AbgGWXsV (ORCPT + 99 others); Thu, 23 Jul 2020 19:48:21 -0400 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:17993 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728361AbgGWXsT (ORCPT ); Thu, 23 Jul 2020 19:48:19 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Thu, 23 Jul 2020 16:47:15 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Thu, 23 Jul 2020 16:48:18 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Thu, 23 Jul 2020 16:48:18 -0700 Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 23 Jul 2020 23:48:18 +0000 Received: from hqnvemgw03.nvidia.com (10.124.88.68) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Thu, 23 Jul 2020 23:48:18 +0000 Received: from skomatineni-linux.nvidia.com (Not Verified[10.2.168.236]) by hqnvemgw03.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Thu, 23 Jul 2020 16:48:18 -0700 From: Sowjanya Komatineni To: , , , , , , , CC: , , , , , , , Subject: [RFC PATCH v4 03/14] i2c: tegra: Fix the error path in tegra_i2c_runtime_resume Date: Thu, 23 Jul 2020 16:51:01 -0700 Message-ID: <1595548272-9809-4-git-send-email-skomatineni@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595548272-9809-1-git-send-email-skomatineni@nvidia.com> References: <1595548272-9809-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=1595548035; 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=GyJ1vhtqJ3xldvtM5bdGL3aj2uZlCQL/Al5ZopfVFtN/2FE3WPwKkbLI+d8ENnV13 WCjP+iphCOu/3nY4rP1s2/H/c4t0CsJmj6+GoSRYAF07dHdSTBmlp6TLZYEPJ82yWq 9L3GRBEUhSE7cM8QcO9NG+jJns4cvSKTibQVjQ3FfQzdltOGV3makqy6ZnymOfINlO E4B7VYqvDvhRutOHqWuF1wyPBolyu83kBAdMjEm5DhxFRtFSm4DvOwj5GMS4rk/V7P s6vk/sLQ5pfdUpgiYpstsTvDafiZ+5RwAjQu6Mba1u94tltX9Eau6+ETs6ZTmTp6i2 vl7MHOzQjv0PA== 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