Unverified Commit 17955aba authored by Shengjiu Wang's avatar Shengjiu Wang Committed by Mark Brown
Browse files

ASoC: fsl_micfil: Fix error handler with pm_runtime_enable 



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: 47a70e6f ("ASoC: Add MICFIL SoC Digital Audio Interface driver.")
Signed-off-by: default avatarShengjiu Wang <shengjiu.wang@nxp.com>
Link: https://lore.kernel.org/r/1683540996-6136-1-git-send-email-shengjiu.wang@nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ab6ecfbf

sound/soc/fsl/fsl_micfil.c

+13 −1
Original line number Diff line number Diff line
@@ -1159,7 +1159,7 @@ static int fsl_micfil_probe(struct platform_device *pdev) 
	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;

	}



	fsl_micfil_dai.capture.formats = micfil->soc->formats;
@@ -1169,9 +1169,20 @@ static int fsl_micfil_probe(struct platform_device *pdev) 
	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 void fsl_micfil_remove(struct platform_device *pdev)

{

	pm_runtime_disable(&pdev->dev);

}



static int __maybe_unused fsl_micfil_runtime_suspend(struct device *dev)
@@ -1232,6 +1243,7 @@ static const struct dev_pm_ops fsl_micfil_pm_ops = { 


static struct platform_driver fsl_micfil_driver = {

	.probe = fsl_micfil_probe,

	.remove_new = fsl_micfil_remove,

	.driver = {

		.name = "fsl-micfil-dai",

		.pm = &fsl_micfil_pm_ops,