From 17955aba7877a4494d8093ae5498e19469b01d57 Mon Sep 17 00:00:00 2001

From: Shengjiu Wang <shengjiu.wang@nxp.com>

Date: Mon, 8 May 2023 18:16:36 +0800

Subject: [PATCH] ASoC: fsl_micfil: Fix error handler with pm_runtime_enable

Git-commit: 17955aba7877a4494d8093ae5498e19469b01d57

Patch-mainline: v6.4-rc3

References: git-fixes

There is error message when defer probe happens:

fsl-micfil-dai 30ca0000.micfil: Unbalanced pm_runtime_enable!

Fix the error handler with pm_runtime_enable and add

fsl_micfil_remove() for pm_runtime_disable.

Fixes: 47a70e6fc9a8 ("ASoC: Add MICFIL SoC Digital Audio Interface driver.")

Signed-off-by: Shengjiu Wang 

Link: https://lore.kernel.org/r/1683540996-6136-1-git-send-email-shengjiu.wang@nxp.com

Signed-off-by: Mark Brown 

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 sound/soc/fsl/fsl_micfil.c |   15 ++++++++++++++-

 1 file changed, 14 insertions(+), 1 deletion(-)

--- a/sound/soc/fsl/fsl_micfil.c

+++ b/sound/soc/fsl/fsl_micfil.c

@@ -763,7 +763,7 @@ static int fsl_micfil_probe(struct platf

 	ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);

 	if (ret) {

 		dev_err(&pdev->dev, "failed to pcm register\n");

-		return ret;

+		goto err_pm_disable;

 	}

 	ret = devm_snd_soc_register_component(&pdev->dev, &fsl_micfil_component,

@@ -771,9 +771,21 @@ static int fsl_micfil_probe(struct platf

 	if (ret) {

 		dev_err(&pdev->dev, "failed to register component %s\n",

 			fsl_micfil_component.name);

+		goto err_pm_disable;

 	}

 	return ret;

+

+err_pm_disable:

+	pm_runtime_disable(&pdev->dev);

+

+	return ret;

+}

+

+static int fsl_micfil_remove(struct platform_device *pdev)

+{

+	pm_runtime_disable(&pdev->dev);

+	return 0;

 }

 static int __maybe_unused fsl_micfil_runtime_suspend(struct device *dev)

@@ -834,6 +846,7 @@ static const struct dev_pm_ops fsl_micfi

 static struct platform_driver fsl_micfil_driver = {

 	.probe = fsl_micfil_probe,

+	.remove = fsl_micfil_remove,

 	.driver = {

 		.name = "fsl-micfil-dai",

 		.pm = &fsl_micfil_pm_ops,