From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0263EC433DF for ; Mon, 27 Jul 2020 14:38:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB4442083B for ; Mon, 27 Jul 2020 14:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595860709; bh=iEtFf7QMN19S5dmrOUJonugb+EIs3TYktwEmUKejVvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=X7yXgfbzjEXoL692MKEWsaCqxVMRtLXUWPO1PXLj6SxsQb/Yrj7ekNLLTCL6NsDbT s9mHZc05A7Zmb0tFT8gMxFkTZNQUqDz2vPRY2xfju7zGZ7XGAgeNevpVlBo2CG3w38 Rh72j6cUDdC/EhVAfH8C+Rape7Z1OzNoTIrPceSw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732952AbgG0Oi2 (ORCPT ); Mon, 27 Jul 2020 10:38:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:33956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729410AbgG0OKs (ORCPT ); Mon, 27 Jul 2020 10:10:48 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CD5ED2083E; Mon, 27 Jul 2020 14:10:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859048; bh=iEtFf7QMN19S5dmrOUJonugb+EIs3TYktwEmUKejVvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CauK4a8jiVCT6HzTR5p3IcMMq+iKd6PXjHTtbFUsvSL8pwDLeaQlrB+5x6fHaM1U7 DL3LJxn3E895ZKdb4n//84zYTnGPLd1QgJNz1fKgaEpjwzaqSGSbHqLQtAExK0Ji2A 7j+3Rx66S2xJleP7dBbdmv5v+AwRTwvf3wII3lSk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dinghao Liu , Jon Hunter , Vinod Koul , Sasha Levin Subject: [PATCH 4.19 47/86] dmaengine: tegra210-adma: Fix runtime PM imbalance on error Date: Mon, 27 Jul 2020 16:04:21 +0200 Message-Id: <20200727134916.775045097@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134914.312934924@linuxfoundation.org> References: <20200727134914.312934924@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinghao Liu [ Upstream commit 5b78fac4b1ba731cf4177fdbc1e3a4661521bcd0 ] pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code. Thus a pairing decrement is needed on the error handling path to keep the counter balanced. Signed-off-by: Dinghao Liu Reviewed-by: Jon Hunter Link: https://lore.kernel.org/r/20200624064626.19855-1-dinghao.liu@zju.edu.cn Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/tegra210-adma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c index 045351f3549c1..86b45198fb962 100644 --- a/drivers/dma/tegra210-adma.c +++ b/drivers/dma/tegra210-adma.c @@ -583,6 +583,7 @@ static int tegra_adma_alloc_chan_resources(struct dma_chan *dc) ret = pm_runtime_get_sync(tdc2dev(tdc)); if (ret < 0) { + pm_runtime_put_noidle(tdc2dev(tdc)); free_irq(tdc->irq, tdc); return ret; } @@ -764,8 +765,10 @@ static int tegra_adma_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); ret = pm_runtime_get_sync(&pdev->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(&pdev->dev); goto rpm_disable; + } ret = tegra_adma_init(tdma); if (ret) -- 2.25.1