diff options
| author | Mark Brown <broonie@kernel.org> | 2023-05-12 13:14:20 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-05-15 19:55:52 +0900 |
| commit | 1946dda47c8807517ccaa8caf8ee7de3498db531 (patch) | |
| tree | 384bc3a6ca4499c56c60326a3de72c03b796d438 /sound/soc/fsl | |
| parent | 7590c6a897c51df5f55779ec80542794982d6631 (diff) | |
| parent | f63550e2b165208a2f382afcaf5551df9569e1d4 (diff) | |
| download | linux-stable-1946dda47c8807517ccaa8caf8ee7de3498db531.tar.gz linux-stable-1946dda47c8807517ccaa8caf8ee7de3498db531.tar.bz2 linux-stable-1946dda47c8807517ccaa8caf8ee7de3498db531.zip | |
ASoC: Merge up fixes for CI
Avoid tripping over fixed issues in CI.
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/fsl_micfil.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index 94341e4352b3..3f08082a55be 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -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, |