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 D162ECDB47E for ; Wed, 18 Oct 2023 14:17:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345128AbjJRORu (ORCPT ); Wed, 18 Oct 2023 10:17:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345168AbjJROR3 (ORCPT ); Wed, 18 Oct 2023 10:17:29 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38CBB469B; Wed, 18 Oct 2023 07:15:58 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31B95C433CA; Wed, 18 Oct 2023 14:15:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697638558; bh=s1ph/e5CvmP+kEopbYViuErhn7Io0he8Jcmuehdg/4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dMux53DV4DmFewTQplHdMHSbn/Dpu5sdNmMSI7Z9Xa88yELqZCOJwKFZP6+gfH4IV ZRYdCgyHL5Qyd/IUa3OucJG0/5e/q+QiUKN6Kf6XEz3g2uDMNop3vlRmQnX9VLYSu2 n9yHR5n1hfCFoUBTFZRLDQu3EXsU7uDiEifNbjzz+eEEpMCXl6XoFUVb0QlS+qEzZZ Iu+iFlUJpZJeLw6DGP/n7fZVff1X4X8qULMmNx8o07MaLR3DHuhLnTpzePx7DDfYUx +SRZPPFzr0dmB8WwLEgsuTXGAOpX7bQ3iXZR36AjttX/ZQ6DTHR2V1M+mtN65UqjoU Mgt0xE3UHycsQ== 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 4.19 4/7] dmaengine: ste_dma40: Fix PM disable depth imbalance in d40_probe Date: Wed, 18 Oct 2023 10:15:43 -0400 Message-Id: <20231018141548.1335665-4-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231018141548.1335665-1-sashal@kernel.org> References: <20231018141548.1335665-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.19.296 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 e9d76113c9e95..d7d3bf7920ead 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -3685,6 +3685,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); kfree(base->lcla_pool.alloc_map); kfree(base->lookup_log_chans); -- 2.40.1