Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp5730ybg; Mon, 27 Jul 2020 13:54:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5LAwfW5IlKa/YskLuwnjfY5NUp8dbmGm3UdHr1aV5AoBba1gvSqsRn15Pc28TsEpLk7/i X-Received: by 2002:a50:fb06:: with SMTP id d6mr22407041edq.165.1595883254333; Mon, 27 Jul 2020 13:54:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595883254; cv=none; d=google.com; s=arc-20160816; b=ycwuZzyYawHH2ylcfUOuXLlKuAY1y1YZX+w1tOKgDNB49WHbGkwz4NAYjhG/5rqAW/ hvXDi9zFFfsoSLRGTwGJyaYXrx6R0Hyl77bWc/J/v+RjeFUfB97qv1kSJpoaDQVxzllj D5KfcHo+AekXoJdz961S9PWA+Q6UC/4VlewEpCukRoXoYgbH6pdMjj8trcyiMDrp/nhT PNkCYGkDm2e+SvCun43EZxcvmU9BWjsBfsrVXqz2mRJWsSYfP6B3NtopgtD82aviPG29 CahDJnw3PC/k7x2q0bXyUW0OxpFXC+eQn0rkaIHQgjdeEnSBiQFi6MUxTjem+2up3G0P Ic0w== 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=XQCuT+X5xFWbpK2llLNhsmBbg0HBAV9bHrS0xwzVjM4=; b=HdzWBMaJHQbz60gnB1m6NlpMspmNom4L4Za1rMJ+kDox7ZKUL/M4GKr09A13068xt0 bimfLrXimXTZYi0VFHX0NAFDZVXiAgCaYztAUOizh5CU91x1iq1FEzDFQgAl7aqy3Atf a/r1nl66M2tjSlyZVSEd+VnWqg99pHBshzmhZFVMD2ScoKgT5CGtbMQNpV9nvtzuDjSx L8uy2pjAWKTnKYvOx/SCk946jZxpy6unfuamDkOzzINcSBYFaHe34kIba8d0ErW0Qzgb Sp6l+TTemZGJRdskb/1uzXIH2KIhNOVwrFsSrONXYN7eFEiPMFm1Hz/1Rqlf7ulX4JFe Z1lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=GO6DmSb1; 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 dm12si4432237ejc.675.2020.07.27.13.53.52; Mon, 27 Jul 2020 13:54:14 -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=GO6DmSb1; 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 S1728145AbgG0UxO (ORCPT + 99 others); Mon, 27 Jul 2020 16:53:14 -0400 Received: from hqnvemgate24.nvidia.com ([216.228.121.143]:14236 "EHLO hqnvemgate24.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727811AbgG0Uvw (ORCPT ); Mon, 27 Jul 2020 16:51:52 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate24.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Mon, 27 Jul 2020 13:50:22 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Mon, 27 Jul 2020 13:51:52 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Mon, 27 Jul 2020 13:51:52 -0700 Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 27 Jul 2020 20:51:52 +0000 Received: from hqnvemgw03.nvidia.com (10.124.88.68) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Mon, 27 Jul 2020 20:51:52 +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 ; Mon, 27 Jul 2020 13:51:51 -0700 From: Sowjanya Komatineni To: , , , , , , , CC: , , , , , , , Subject: [RFC PATCH v5 03/14] i2c: tegra: Fix the error path in tegra_i2c_runtime_resume Date: Mon, 27 Jul 2020 13:57:21 -0700 Message-ID: <1595883452-17343-4-git-send-email-skomatineni@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595883452-17343-1-git-send-email-skomatineni@nvidia.com> References: <1595883452-17343-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=1595883022; bh=XQCuT+X5xFWbpK2llLNhsmBbg0HBAV9bHrS0xwzVjM4=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:X-NVConfidentiality:MIME-Version: Content-Type; b=GO6DmSb1g9D/k/gmCmeTJPzzsNel4EkC9dDMk/kfNe6Af8XUVorg3jO7zR2Faltg+ 1Lu5YPr4JspLWeyeiR1CqD9PxqElG0jDuZ4M966m4nAJoQbu+FheCPWNn7FUB0/YgF q/34dQxdGy+oPniDT0U6oN49R0d7oRVkKVlRnjNgHXkywvtmvgsvDbjWtTARnM4Lm2 VZWjaYf+aORvsPwzRCdFQ8aekeAnzf4oNJATCabwnSNE0v6j9YUegL+a7HzAhFwXpH jlPBgHMv1JTND4BxPfIHW5XkUWDeU3jkFtAxWZHvjtnWn2jG3zMHyfN0k+LtGMIorL L5zAHol9Ku5fA== 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. Reviewed-by: Dmitry Osipenko 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