diff options
| author | Olivier Moysan <olivier.moysan@st.com> | 2020-04-17 16:21:22 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-04-17 19:37:14 +0100 |
| commit | e2bcb65782f91390952e849e21b82ed7cb05697f (patch) | |
| tree | 7a9b73df18c903935cb0cbe7802eccdcfbcfb9d8 /sound | |
| parent | 15a5760cb8b6d5c1ebbf1d2e1f0b77380ab68a82 (diff) | |
| download | linux-e2bcb65782f91390952e849e21b82ed7cb05697f.tar.gz linux-e2bcb65782f91390952e849e21b82ed7cb05697f.tar.bz2 linux-e2bcb65782f91390952e849e21b82ed7cb05697f.zip | |
ASoC: stm32: sai: fix sai probe
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>
Link: https://lore.kernel.org/r/20200417142122.10212-1-olivier.moysan@st.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/stm/stm32_sai_sub.c | 12 |
1 files changed, 5 insertions, 7 deletions
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) |