On Mon, Dec 25, 2023 at 4:06 PM Chancel Liu <chancel....@nxp.com> wrote:
>
> There is error message when defer probe happens:
>
> fsl_rpmsg rpmsg_audio: Unbalanced pm_runtime_enable!
>
> Fix the error handler with pm_runtime_enable.
>
> Fixes: b73d9e6225e8 ("ASoC: fsl_rpmsg: Add CPU DAI driver for audio base on
> rpmsg")
> Signed-off-by: Chancel Liu <chancel....@nxp.com>
Acked-by: Shengjiu Wang <shengjiu.w...@gmail.com>
Best regards
wang shengjiu
> ---
> sound/soc/fsl/fsl_rpmsg.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_rpmsg.c b/sound/soc/fsl/fsl_rpmsg.c
> index 5c5c04ce9db7..00852f174a69 100644
> --- a/sound/soc/fsl/fsl_rpmsg.c
> +++ b/sound/soc/fsl/fsl_rpmsg.c
> @@ -238,7 +238,7 @@ static int fsl_rpmsg_probe(struct platform_device *pdev)
> ret = devm_snd_soc_register_component(&pdev->dev, &fsl_component,
> &fsl_rpmsg_dai, 1);
> if (ret)
> - return ret;
> + goto err_pm_disable;
>
> rpmsg->card_pdev = platform_device_register_data(&pdev->dev,
> "imx-audio-rpmsg",
> @@ -248,16 +248,22 @@ static int fsl_rpmsg_probe(struct platform_device *pdev)
> if (IS_ERR(rpmsg->card_pdev)) {
> dev_err(&pdev->dev, "failed to register rpmsg card\n");
> ret = PTR_ERR(rpmsg->card_pdev);
> - return ret;
> + goto err_pm_disable;
> }
>
> return 0;
> +
> +err_pm_disable:
> + pm_runtime_disable(&pdev->dev);
> + return ret;
> }
>
> static void fsl_rpmsg_remove(struct platform_device *pdev)
> {
> struct fsl_rpmsg *rpmsg = platform_get_drvdata(pdev);
>
> + pm_runtime_disable(&pdev->dev);
> +
> if (rpmsg->card_pdev)
> platform_device_unregister(rpmsg->card_pdev);
> }
> --
> 2.42.0
>
