Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp545243rwb; Sun, 6 Nov 2022 09:40:37 -0800 (PST) X-Google-Smtp-Source: AMsMyM5Nv4Hx6IGu56MguVupeNw+wA8gBCclPPaCFZrrLYLJTUWaRb5uX9UHRQNibnQ3Fk33r0O7 X-Received: by 2002:a05:6402:358e:b0:461:ea80:fb61 with SMTP id y14-20020a056402358e00b00461ea80fb61mr45673131edc.356.1667756437781; Sun, 06 Nov 2022 09:40:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667756437; cv=none; d=google.com; s=arc-20160816; b=iUJMe9nmdR+NhlOuGaKg7GRy9uVL4OMkERhPAIgsjVXzbVVSTiu9lnacrXy93nogo0 AwB7/OpyXB1/XMc+5PDbCJ0lSxXL1d5tZsZvECTzDkaVQIogbdLQSmDiQygOxSmlsNRX LrCaoao3m6R4Ci2jz210LWUf1p35/azwwp9Hq3OeAYVhlMdUUVSTzItZ3BpmrF4rtuZG XQ1GcrOeclIcgrYoiz2hP+6fODQr9j12e3rFiWvjOW0INZ8DtQX+pXjLtQEnrCugvkNl P7BZMLi6Cis8uea5KkWokQNZMJZ4GeK3fWMByF+7uda0WtWnYkMgEKC87NXeFLF0uPHC STBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=VpFML6B5VaVBUQ5HdSWIk8yRot0iW24eT6ltiXhydts=; b=mcnqASgYJiccaQ1e32pugm1YhJ/HzzZP+Yy9Of27nARMhf5gJ7gmcrKThdmIhiL/MF 45pUeiXmvBjCDgW+ZmNsQFJBL+iueRvfF4XH2IkxrtUguLmvuYlkasnJCdoy5UzWjFqa 85sfk5cl9xC+HdKRLZvBn41lQAkFT+fmQ4leugxPr+NwzaegrP5tjx/cxTL0ISNp+eOY oT/CBMjCSxdr9nwFhgD2rf9epXBP+SVZNY29H4tQyFy3APIXd7obHndj/XoMoZ1KaQqj clkNzLu5mmKvyoMOiYTaxBwQ/DzELf3Y+OkEtDhFb5LpZ4ZvUblNdiHmClSq8iT0Vfrf YJbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mj4h7km4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dy3-20020a05640231e300b004604e9d477dsi5993270edb.265.2022.11.06.09.40.15; Sun, 06 Nov 2022 09:40:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mj4h7km4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230224AbiKFRKm (ORCPT + 96 others); Sun, 6 Nov 2022 12:10:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230462AbiKFRKP (ORCPT ); Sun, 6 Nov 2022 12:10:15 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEEB813E9E; Sun, 6 Nov 2022 09:06:56 -0800 (PST) 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 dfw.source.kernel.org (Postfix) with ESMTPS id DFB0C60CEC; Sun, 6 Nov 2022 17:06:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E9A8C433C1; Sun, 6 Nov 2022 17:06:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667754400; bh=QsbOPHdCc0XpSE+AJAJkwvXzmMbxdn3gOwMLqMDquC0=; h=From:To:Cc:Subject:Date:From; b=mj4h7km47n2zvJp43DJ5TVd/37lNHf80sOv5LyyOvBUNQqPpEsd3FWZ/gnYScoor2 CJzRu34QWJXTtxP0ndmoLzebmpmB10zhq87GhcCfsDa6o3VtHeBLBUogY1ldA3Ym1E 3U4GgTas06D/PydE3jOanXshaBtWcvKewEblbawjj45WrsSez0DDl25ePuIz7ffxCH evgyGBAQqiXj3G3pMaqomQx/Hul8fhAZfNvn50w59stHZBpd2HkJ9PEvQkl44rLw2B XWYcam+TrpRDYqQsaNY9vtw7Q9KUGJWUE2GQQnghX6mkjbQB/tMco9bOWfi/yPxY5u RnQOPMwzqROVg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Qilong , Charles Keepax , Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, patches@opensource.cirrus.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.4 01/12] ASoC: wm5102: Revert "ASoC: wm5102: Fix PM disable depth imbalance in wm5102_probe" Date: Sun, 6 Nov 2022 12:06:25 -0500 Message-Id: <20221106170637.1580802-1-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhang Qilong [ Upstream commit de71d7567e358effd06dfc3e2a154b25f1331c10 ] This reverts commit fcbb60820cd3008bb44334a0395e5e57ccb77329. The pm_runtime_disable is redundant when error returns in wm5102_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-2-zhangqilong3@huawei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wm5102.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index c5667b149c70..d6d4b4121369 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -2084,6 +2084,9 @@ static int wm5102_probe(struct platform_device *pdev) regmap_update_bits(arizona->regmap, wm5102_digital_vu[i], WM5102_DIG_VU, WM5102_DIG_VU); + pm_runtime_enable(&pdev->dev); + pm_runtime_idle(&pdev->dev); + ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, "ADSP2 Compressed IRQ", wm5102_adsp2_irq, wm5102); @@ -2116,9 +2119,6 @@ static int wm5102_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