On Tue, Dec 03, 2019 at 07:13:03PM +0800, Chuhong Yuan wrote:
> The driver forgets to call pm_runtime_disable in probe failure
> and remove.
> Add the missed calls to fix it.
>
> Signed-off-by: Chuhong Yuan <hslester96@xxxxxxxxx>
Acked-by: Nicolin Chen <nicoleotsuka@xxxxxxxxx>
Thanks
> ---
> sound/soc/fsl/fsl_audmix.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c
> index a1db1bce330f..5faecbeb5497 100644
> --- a/sound/soc/fsl/fsl_audmix.c
> +++ b/sound/soc/fsl/fsl_audmix.c
> @@ -505,15 +505,20 @@ static int fsl_audmix_probe(struct platform_device *pdev)
> ARRAY_SIZE(fsl_audmix_dai));
> if (ret) {
> dev_err(dev, "failed to register ASoC DAI\n");
> - return ret;
> + goto err_disable_pm;
> }
>
> priv->pdev = platform_device_register_data(dev, mdrv, 0, NULL, 0);
> if (IS_ERR(priv->pdev)) {
> ret = PTR_ERR(priv->pdev);
> dev_err(dev, "failed to register platform %s: %d\n", mdrv, ret);
> + goto err_disable_pm;
> }
>
> + return 0;
> +
> +err_disable_pm:
> + pm_runtime_disable(dev);
> return ret;
> }
>
> @@ -521,6 +526,8 @@ static int fsl_audmix_remove(struct platform_device *pdev)
> {
> struct fsl_audmix *priv = dev_get_drvdata(&pdev->dev);
>
> + pm_runtime_disable(&pdev->dev);
> +
> if (priv->pdev)
> platform_device_unregister(priv->pdev);
>
> --
> 2.24.0
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
