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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 77165C43217 for ; Sun, 6 Nov 2022 17:10:06 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 9635D1635; Sun, 6 Nov 2022 18:09:14 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9635D1635 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1667754604; bh=g4cq773dvlASalNtfikbmrufDOKIajeBhDLQDHGfWhc=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=YPpu+Jab78ivSaStbSmwMd/hggIMAVr8ncidcBpYd3sJ/TQc/AEBp5+ok7X3ykemE l5dGxH030QNp/VXZhOL77wdXG11dZwQlYY3SX6936hWeKKqraC2Vlk07nvGdQbXacH SIPlKzujqUHL/ntGNC2pKU6bIIo0BnooynK3+yEw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 41E1CF8032D; Sun, 6 Nov 2022 18:05:31 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5D27DF805E4; Sun, 6 Nov 2022 18:05:30 +0100 (CET) Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id AD0EAF8032D for ; Sun, 6 Nov 2022 18:05:21 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AD0EAF8032D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="etMYRrSt" Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 4884CCE01BD; Sun, 6 Nov 2022 17:05:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2D12C433C1; Sun, 6 Nov 2022 17:05:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667754317; bh=g4cq773dvlASalNtfikbmrufDOKIajeBhDLQDHGfWhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=etMYRrSt4vwZg1LDTBtqPKwyW8GQQuOFJCD0ye+Ixk2AmHvGUrsci4fetXQNqUSA6 EuSvrLf85nwE9YpOpKw9BoHKXoZ94RB/7E2tMV/T3hT16opec3c54GbrbQqi0ZTc/q 2H2JrD3jhgYHJ/1+wCej4vIgSQZi52emL1tb9wsQcyStvt/kOJEWLcuByK3QDdQL5p 8gxm/l7wQagXAC3Qn3cgGAOFZrX1TfA+Ln0k3eVw9KcbyK/xMi8YnlTAIQkPTQACq2 BBufSOhvbyZbTohc0MlMJN6bgBX2Ln0AxC4fJnqpQqbUY3kxhpprZdkK4Q0kFdbqzy AMM4pQYOtA6bg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 03/18] ASoC: wm8997: Revert "ASoC: wm8997: Fix PM disable depth imbalance in wm8997_probe" Date: Sun, 6 Nov 2022 12:04:52 -0500 Message-Id: <20221106170509.1580304-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221106170509.1580304-1-sashal@kernel.org> References: <20221106170509.1580304-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Cc: Sasha Levin , alsa-devel@alsa-project.org, Charles Keepax , patches@opensource.cirrus.com, Zhang Qilong , tiwai@suse.com, lgirdwood@gmail.com, Mark Brown X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Zhang Qilong [ Upstream commit 68ce83e3bb26feba0fcdd59667fde942b3a600a1 ] This reverts commit 41a736ac20602f64773e80f0f5b32cde1830a44a. The pm_runtime_disable is redundant when error returns in wm8997_probe, we just revert the old patch to fix it. Signed-off-by: Zhang Qilong Acked-by: Charles Keepax Link: https://lore.kernel.org/r/20221010114852.88127-4-zhangqilong3@huawei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wm8997.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c index c8c711e555c0..38ef631d1a1f 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -1162,6 +1162,9 @@ static int wm8997_probe(struct platform_device *pdev) regmap_update_bits(arizona->regmap, wm8997_digital_vu[i], WM8997_DIG_VU, WM8997_DIG_VU); + pm_runtime_enable(&pdev->dev); + pm_runtime_idle(&pdev->dev); + arizona_init_common(arizona); ret = arizona_init_vol_limit(arizona); @@ -1180,9 +1183,6 @@ static int wm8997_probe(struct platform_device *pdev) goto err_spk_irqs; } - pm_runtime_enable(&pdev->dev); - pm_runtime_idle(&pdev->dev); - return ret; err_spk_irqs: -- 2.35.1