lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 521/593] ASoC: fsl_spdif: Fix error handler with pm_runtime_enable
    Date
    From: Shengjiu Wang <shengjiu.wang@nxp.com>

    [ Upstream commit 28108d71ee11a7232e1102effab3361049dcd3b8 ]

    There is error message when defer probe happens:

    fsl-spdif-dai 2dab0000.spdif: Unbalanced pm_runtime_enable!

    Fix the error handler with pm_runtime_enable and add
    fsl_spdif_remove() for pm_runtime_disable.

    Fixes: 9cb2b3796e08 ("ASoC: fsl_spdif: Add pm runtime function")
    Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
    Link: https://lore.kernel.org/r/1623392318-26304-1-git-send-email-shengjiu.wang@nxp.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/fsl/fsl_spdif.c | 20 +++++++++++++++++---
    1 file changed, 17 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
    index b0f643fefe1e..1fbc6d780700 100644
    --- a/sound/soc/fsl/fsl_spdif.c
    +++ b/sound/soc/fsl/fsl_spdif.c
    @@ -1358,16 +1358,29 @@ static int fsl_spdif_probe(struct platform_device *pdev)
    &spdif_priv->cpu_dai_drv, 1);
    if (ret) {
    dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
    - return ret;
    + goto err_pm_disable;
    }

    ret = imx_pcm_dma_init(pdev, IMX_SPDIF_DMABUF_SIZE);
    - if (ret && ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev, "imx_pcm_dma_init failed: %d\n", ret);
    + if (ret) {
    + dev_err_probe(&pdev->dev, ret, "imx_pcm_dma_init failed\n");
    + goto err_pm_disable;
    + }
    +
    + return ret;

    +err_pm_disable:
    + pm_runtime_disable(&pdev->dev);
    return ret;
    }

    +static int fsl_spdif_remove(struct platform_device *pdev)
    +{
    + pm_runtime_disable(&pdev->dev);
    +
    + return 0;
    +}
    +
    #ifdef CONFIG_PM
    static int fsl_spdif_runtime_suspend(struct device *dev)
    {
    @@ -1469,6 +1482,7 @@ static struct platform_driver fsl_spdif_driver = {
    .pm = &fsl_spdif_pm,
    },
    .probe = fsl_spdif_probe,
    + .remove = fsl_spdif_remove,
    };

    module_platform_driver(fsl_spdif_driver);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 09:13    [W:4.413 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site