]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: stm32: sai: Add missing cleanup
authorJulia Lawall <Julia.Lawall@inria.fr>
Sun, 5 Apr 2020 15:03:48 +0000 (17:03 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 6 Apr 2020 14:03:27 +0000 (15:03 +0100)
The commit 18fdd9cfa252 ("ASoC: stm32: sai: manage rebind issue")
converts some function calls to their non-devm equivalents.  The
appropriate cleanup code was added to the remove function, but not
to the probe function.  Add a call to snd_dmaengine_pcm_unregister
to compensate for the call to snd_dmaengine_pcm_register in case
of subsequent failure.

Fixes: commit 18fdd9cfa252 ("ASoC: stm32: sai: manage rebind issue")
Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr>
Acked-by: Olivier Moysan <olivier.moysan@st.com>
Link: https://lore.kernel.org/r/1586099028-5104-1-git-send-email-Julia.Lawall@inria.fr
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/stm/stm32_sai_sub.c

index 2bd280c01c3316a961ec3bf44d55ae669498dbbe..0d0c9afd8791f46dafd9b11f448fb9f01efdd007 100644 (file)
@@ -1556,8 +1556,10 @@ static int stm32_sai_sub_probe(struct platform_device *pdev)
 
        ret = snd_soc_register_component(&pdev->dev, &stm32_component,
                                         &sai->cpu_dai_drv, 1);
-       if (ret)
+       if (ret) {
+               snd_dmaengine_pcm_unregister(&pdev->dev);
                return ret;
+       }
 
        if (STM_SAI_PROTOCOL_IS_SPDIF(sai))
                conf = &stm32_sai_pcm_config_spdif;