| Message ID | 1586099028-5104-1-git-send-email-Julia.Lawall@inria.fr (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 7506baeed8d05fc164254c64af14cfed2ac14446 |
| Headers | show |
| Series | ASoC: stm32: sai: Add missing cleanup | expand |
On 4/5/20 5:03 PM, Julia Lawall wrote: > The commit 0d6defc7e0e4 ("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 0d6defc7e0e4 ("ASoC: stm32: sai: manage rebind issue") > Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr> > > --- > > Not tested. > > sound/soc/stm/stm32_sai_sub.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Hi Julia, Thanks for the patch. Acked-by: Olivier Moysan <olivier.moysan@st.com> > > diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c > index 2bd280c..0d0c9af 100644 > --- a/sound/soc/stm/stm32_sai_sub.c > +++ b/sound/soc/stm/stm32_sai_sub.c > @@ -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; >
diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 2bd280c..0d0c9af 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -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;
The commit 0d6defc7e0e4 ("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 0d6defc7e0e4 ("ASoC: stm32: sai: manage rebind issue") Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr> --- Not tested. sound/soc/stm/stm32_sai_sub.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)