| Message ID | 20200417142122.10212-1-olivier.moysan@st.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | e2bcb65782f91390952e849e21b82ed7cb05697f |
| Headers | show |
| Series | ASoC: stm32: sai: fix sai probe | expand |
On Fri, 17 Apr 2020 16:21:22 +0200, Olivier Moysan wrote: > pcm config must be set before snd_dmaengine_pcm_register() call. > > Fixes: 0d6defc7e0e4 ("ASoC: stm32: sai: manage rebind issue") > > Signed-off-by: Olivier Moysan <olivier.moysan@st.com> > --- > sound/soc/stm/stm32_sai_sub.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > [...] Applied, thanks! [1/1] ASoC: stm32: sai: fix sai probe commit: e2bcb65782f91390952e849e21b82ed7cb05697f All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 34a7c3d6fb91..41f01c3e639e 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1547,6 +1547,9 @@ static int stm32_sai_sub_probe(struct platform_device *pdev) return ret; } + if (STM_SAI_PROTOCOL_IS_SPDIF(sai)) + conf = &stm32_sai_pcm_config_spdif; + ret = snd_dmaengine_pcm_register(&pdev->dev, conf, 0); if (ret) { if (ret != -EPROBE_DEFER) @@ -1556,15 +1559,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; - return 0; + return ret; } static int stm32_sai_sub_remove(struct platform_device *pdev)
pcm config must be set before snd_dmaengine_pcm_register() call. Fixes: 0d6defc7e0e4 ("ASoC: stm32: sai: manage rebind issue") Signed-off-by: Olivier Moysan <olivier.moysan@st.com> --- sound/soc/stm/stm32_sai_sub.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)