Unverified Commit 28108d71 authored by Shengjiu Wang's avatar Shengjiu Wang Committed by Mark Brown
Browse files

ASoC: fsl_spdif: Fix error handler with pm_runtime_enable 



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: 9cb2b379 ("ASoC: fsl_spdif: Add pm runtime function")
Signed-off-by: default avatarShengjiu Wang <shengjiu.wang@nxp.com>
Link: https://lore.kernel.org/r/1623392318-26304-1-git-send-email-shengjiu.wang@nxp.com


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

sound/soc/fsl/fsl_spdif.c

+17 −3
Original line number Diff line number Diff line
@@ -1375,16 +1375,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)

{
@@ -1487,6 +1500,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);