Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp292562rdg; Thu, 12 Oct 2023 06:03:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFsl3jeqxwS5+2qOoOs3rxcQbWIXbR8SL11jC1V+Mld2z/2TTMBOyHhv+rGA3ysBt36inT1 X-Received: by 2002:a17:902:ea06:b0:1c5:e207:836e with SMTP id s6-20020a170902ea0600b001c5e207836emr33725893plg.26.1697115816590; Thu, 12 Oct 2023 06:03:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697115816; cv=none; d=google.com; s=arc-20160816; b=cgSA7oXJ6IMTeJTsEtjbQ32uN3hBvJ9adXqehcnuFdSZhafFxvpR2yN98JXlAFTb90 Jz7WwVB4lSfEjc7z88MmiLGoMijSFjK57vQQgiiXwyJPhGxQ9MPz8JXhmURrWH6Zy7zZ XMeNFJtcJ+2gdKa6yJCoyHvEI//PZKJrW5qspVib4/jMxCgbEfjU/p8E8Zu2seh1+6aA UlSq2KLSWYgUIWvR5Yczr9/KRP5o/t6EXdfoEYayMwwaioTYgJffY3I+GtUVSeEhwarr WlJ9wA9Cxft+1aa/ZqDsOVb1unHwKsrAgvPLjSKhweBSG3/l7XBHuv05yly5L6sbUFxn Xomw== 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:date :subject:cc:to:from:message-id:dkim-signature; bh=hvsAf3IGRqX1DpOH2B+0eu/3cS+DbSNmEVlnCQEwAPA=; fh=rdEZchaYBQjjjlECLJ957P3vvju6HdSQ6slRt1D2WQw=; b=DVZTn/uOUyIG3kE/E9Z8wtyrbOMggRDK+e23xJaE8Ys5FcFPI56RgXPJ5zqkrdu+nx bDr9p7fomPps9te7nB9xhpWF5rD7I/al+luwJQYZvp15AM1WiWWJFTWn/Kmjdlynaks0 gyLDFmi0oqEW80H8GyIvRt47U1TUp9P6jkD7/0GqNkxUNjAbEEzB+8GZrjukduOEJeWm g/HFZfO/vYaGSou0fOhpfVT6rqt0caMtwVcSITbyWcXqgq8vSWL5h7yK2NJJmvViPdPw 2cA1nbrY1wgLDhNrlymnAd2NEuRW4TA8w6IvsI0DW+uJRLtnHZHQixGvt3Wr8oIlBDXs x7vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@foxmail.com header.s=s201512 header.b=xIVqlAI+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id l9-20020a170902f68900b001bb8f59aca3si2165647plg.583.2023.10.12.06.03.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 06:03:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@foxmail.com header.s=s201512 header.b=xIVqlAI+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 1E169825B51F; Thu, 12 Oct 2023 06:03:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378390AbjJLNDZ (ORCPT + 99 others); Thu, 12 Oct 2023 09:03:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347249AbjJLNDY (ORCPT ); Thu, 12 Oct 2023 09:03:24 -0400 Received: from out203-205-221-202.mail.qq.com (out203-205-221-202.mail.qq.com [203.205.221.202]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3DA8BA for ; Thu, 12 Oct 2023 06:03:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1697115799; bh=hvsAf3IGRqX1DpOH2B+0eu/3cS+DbSNmEVlnCQEwAPA=; h=From:To:Cc:Subject:Date; b=xIVqlAI+MMxWHV8Ql/OrHa1B2a9KW0AkuRe692cE4KFTPhzGM/0YN6tubED79I2vt P1jj/JOi71l5ClqRCRKFOvYhDxMdNCnVE+/0N3Mfr5Al9RewW43uhLlcLmcABSXjwW dVglKrq7NIhWWe/Veo8ighGwduHw9ucRdNGDsO1k= Received: from KernelDevBox.byted.org ([180.184.51.134]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id D0812F3; Thu, 12 Oct 2023 21:03:16 +0800 X-QQ-mid: xmsmtpt1697115796tm51ic8m3 Message-ID: X-QQ-XMAILINFO: MBbh9ZpQ5zEXVx6UGxhPICBGQ86jjAY9/rzQHXsVFdPVPnpl/tB3oiG+Emdu+m Af8IFJAW+IPI+tPgqlogsl8cZSmYOfarhikPKuLw6GNlLlRBXiCzQ3yhJoc9g/KiwI3LWrptYut4 AT9EkS7Yq+6s6lHZ1IfYQHC5LHtxe+vDZs/fZQDr56MWt1WPT8QFxYseqKyC537yTXVML05U1OAn rv+38rBztGRrs4gyx43dxflMJFiGm/nWOK/DTRXu0H8ybJzRXiw2o19n7wjqSjkuxAfj8b9xal/K fXvSrzy31NuFEUTO462fB/ddtKCn8V1wDu3t+e+8zlcwnlrxerkk7abcOobEPDMNNK9AA0Yn1YdP xgk++wJrDjRqf3YuOXmsFoeGiK7fG4B5CaVqH/EGN+kWf7e1kaUUy22aevWiidzJrTnWPX2aAqQ8 pgt1LXMdukqp3pZamL46HfVhssBkaIrOM5Uy6Gpazi5WK0lPzayrFNPDFLQ0cCxpvmKBDANQvjAP qy98k1gLDddXVcyQEh/yCiECF2Ktbq67xY4q4xRMvkjilRurg7ZdNndvnOFTto9a7oB3I4A1puaD fXNLBe9wo8gAmLwjnPfhK4vz96MGPGEP5T5cCQsCHH42wA2SKbPs+J2kw6AtQDBvLVeQrWU5JSyp hAZ/+2gh805x6770Kz3SS7NmH8nPRNPZIAmSbHt/MRIILY98sSim/p/UJ8IThaQTeFuDkNor832D TIOnCML28W+RWsXp2Isajvtym5vngbFEgSyeBTPpHEvtge0v8D3HB9+sYYuC5bbo8jQk5tCFgRDo 5J5esf0wjCJgPOXd+6GFzzrfHy5oovlBaofAjd/cV8t4BtWU3wa3S1xFJuVVFEntxGzhc2Ss4CLH 2EO+BCHIsKWmToWrgK1oiqhmazziU6zftAREhaphL2RL7D6pjy5T0jHXItmossKVd4h34D1210s3 FSixcSEUPCy1/ih1b+OaBXu2wPoUL+91Gp3KcJhFtNFaNOXyqHvV1NKYfP2vwO X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: Zhang Shurong To: shengjiu.wang@gmail.com Cc: Xiubo.Lee@gmail.com, festevam@gmail.com, nicoleotsuka@gmail.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Zhang Shurong Subject: [PATCH v2] ASoC: fsl: Fix PM disable depth imbalance in fsl_easrc_probe Date: Thu, 12 Oct 2023 21:03:15 +0800 X-OQ-MSGID: <20231012130315.3292117-1-zhang_shurong@foxmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 12 Oct 2023 06:03:34 -0700 (PDT) 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. Fixes: 955ac624058f ("ASoC: fsl_easrc: Add EASRC ASoC CPU DAI drivers") Signed-off-by: Zhang Shurong --- v1->v2: add Fixes tag sound/soc/fsl/fsl_easrc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_easrc.c b/sound/soc/fsl/fsl_easrc.c index ba62995c909a..ec53bda46a46 100644 --- a/sound/soc/fsl/fsl_easrc.c +++ b/sound/soc/fsl/fsl_easrc.c @@ -1966,17 +1966,21 @@ static int fsl_easrc_probe(struct platform_device *pdev) &fsl_easrc_dai, 1); if (ret) { dev_err(dev, "failed to register ASoC DAI\n"); - return ret; + goto err_pm_disable; } ret = devm_snd_soc_register_component(dev, &fsl_asrc_component, NULL, 0); if (ret) { dev_err(&pdev->dev, "failed to register ASoC platform\n"); - return ret; + goto err_pm_disable; } return 0; + +err_pm_disable: + pm_runtime_disable(&pdev->dev); + return ret; } static void fsl_easrc_remove(struct platform_device *pdev) -- 2.30.2