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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12E6ECDB47E for ; Wed, 18 Oct 2023 14:13:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345059AbjJRONR (ORCPT ); Wed, 18 Oct 2023 10:13:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235146AbjJROMp (ORCPT ); Wed, 18 Oct 2023 10:12:45 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3A8D1A3; Wed, 18 Oct 2023 07:12:43 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E096C433C8; Wed, 18 Oct 2023 14:12:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697638363; bh=RtO1Zkp8LtPC9OQVQarR05odrox0ehFCN6ayOLijdeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JkTK1CbpYMJebxpaN0MF24hkRma13v2ibUHbKOhFu1mnlrbus7CIcUyfHLkxZWYD7 D/mJ3WJazb9HVajRiaGokApuMP6k0LmyTMKSc4A9Cts72nx8VhGAHXyiPwzQFKrQ7Y mywqmtyRkvnIBbSRxQGNAqekuHT3tP1aJGrqtMq1AQuXIEkCSkphM2ithVNPFavrdM 8oexbrmMwqpsIPjSS4IF20Usoz0Zhp1XG8BxkZOmfrjq0WH57oTDwp/HBf4ujp69Ck GEnDQolmfgkakT+tkYh7pvDqcyV9gM6x1m015rN32+9j8lsHgPJUrjtQoXgSmUK5ee +MNEIcOoTvCXw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Shurong , Linus Walleij , Vinod Koul , Sasha Levin , linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org Subject: [PATCH AUTOSEL 6.5 21/31] dmaengine: ste_dma40: Fix PM disable depth imbalance in d40_probe Date: Wed, 18 Oct 2023 10:11:38 -0400 Message-Id: <20231018141151.1334501-21-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231018141151.1334501-1-sashal@kernel.org> References: <20231018141151.1334501-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.7 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org From: Zhang Shurong [ Upstream commit 0618c077a8c20e8c81e367988f70f7e32bb5a717 ] The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context. We fix it by calling pm_runtime_disable when error returns. Signed-off-by: Zhang Shurong Reviewed-by: Linus Walleij Link: https://lore.kernel.org/r/tencent_DD2D371DB5925B4B602B1E1D0A5FA88F1208@qq.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ste_dma40.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 89e82508c1339..002833fb1fa04 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -3668,6 +3668,7 @@ static int __init d40_probe(struct platform_device *pdev) regulator_disable(base->lcpa_regulator); regulator_put(base->lcpa_regulator); } + pm_runtime_disable(base->dev); report_failure: d40_err(dev, "probe failed\n"); -- 2.40.1 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1081BCDB482 for ; Wed, 18 Oct 2023 14:13:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Nj0eyOey2E+4VSgzgIf6R1X067wCkQdtsDHd8W2oN8s=; b=RFmScKYCV5P7Zh 9sWM5EVhUqwhMUtiQOuQfQ2MmE9wXiFk92KVjv9j+cSso+9aOeJM7gKvSbsuxIt+iRKo8XwITiKXe lFheDUacLCibqXm80n/998Qn1qlfi97iC4qO4EQJUxHyIXQMVaP3Y9S6v504ScFzfmgvhjUUOI8CV aPCbl+rDIE3ZRGryLst6Sxc+2hA66XjoAH+xtLXq4sxXZkVLmJv4PAhVTOpUkfJjwEbd5/O+7eI31 cVckJdT6POaxOxTeLjycS2tJVAXzuoAMI24RcskC+lk+yCEym0OoYQRAlX6elh/DeZC/bpsan4uEH RdO2HL7ekSA93YNybSVA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qt7I3-00ErWW-00; Wed, 18 Oct 2023 14:12:51 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qt7Hx-00ErSm-0M for linux-arm-kernel@lists.infradead.org; Wed, 18 Oct 2023 14:12:46 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id C3657B823AF; Wed, 18 Oct 2023 14:12:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E096C433C8; Wed, 18 Oct 2023 14:12:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697638363; bh=RtO1Zkp8LtPC9OQVQarR05odrox0ehFCN6ayOLijdeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JkTK1CbpYMJebxpaN0MF24hkRma13v2ibUHbKOhFu1mnlrbus7CIcUyfHLkxZWYD7 D/mJ3WJazb9HVajRiaGokApuMP6k0LmyTMKSc4A9Cts72nx8VhGAHXyiPwzQFKrQ7Y mywqmtyRkvnIBbSRxQGNAqekuHT3tP1aJGrqtMq1AQuXIEkCSkphM2ithVNPFavrdM 8oexbrmMwqpsIPjSS4IF20Usoz0Zhp1XG8BxkZOmfrjq0WH57oTDwp/HBf4ujp69Ck GEnDQolmfgkakT+tkYh7pvDqcyV9gM6x1m015rN32+9j8lsHgPJUrjtQoXgSmUK5ee +MNEIcOoTvCXw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Shurong , Linus Walleij , Vinod Koul , Sasha Levin , linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org Subject: [PATCH AUTOSEL 6.5 21/31] dmaengine: ste_dma40: Fix PM disable depth imbalance in d40_probe Date: Wed, 18 Oct 2023 10:11:38 -0400 Message-Id: <20231018141151.1334501-21-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231018141151.1334501-1-sashal@kernel.org> References: <20231018141151.1334501-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.7 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231018_071245_296533_6DDB2A2C X-CRM114-Status: GOOD ( 10.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Zhang Shurong [ Upstream commit 0618c077a8c20e8c81e367988f70f7e32bb5a717 ] The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context. We fix it by calling pm_runtime_disable when error returns. Signed-off-by: Zhang Shurong Reviewed-by: Linus Walleij Link: https://lore.kernel.org/r/tencent_DD2D371DB5925B4B602B1E1D0A5FA88F1208@qq.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ste_dma40.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 89e82508c1339..002833fb1fa04 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -3668,6 +3668,7 @@ static int __init d40_probe(struct platform_device *pdev) regulator_disable(base->lcpa_regulator); regulator_put(base->lcpa_regulator); } + pm_runtime_disable(base->dev); report_failure: d40_err(dev, "probe failed\n"); -- 2.40.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel