Commit 40aa5383 authored by Ricard Wanderlof's avatar Ricard Wanderlof Committed by Mark Brown

ASoC: Fail card instantiation if DAI format setup fails

If the DAI format setup fails, there is no valid communication format
between CPU and CODEC, so fail card instantiation, rather than continue
with a card that will most likely not function properly.
Signed-off-by: default avatarRicard Wanderlof <ricardw@axis.com>
Link: https://lore.kernel.org/r/alpine.DEB.2.20.1907241132350.6338@lnxricardw1.se.axis.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 717dedb1
...@@ -1511,8 +1511,11 @@ static int soc_probe_link_dais(struct snd_soc_card *card, ...@@ -1511,8 +1511,11 @@ static int soc_probe_link_dais(struct snd_soc_card *card,
} }
} }
if (dai_link->dai_fmt) if (dai_link->dai_fmt) {
snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt); ret = snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt);
if (ret)
return ret;
}
ret = soc_post_component_init(rtd, dai_link->name); ret = soc_post_component_init(rtd, dai_link->name);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment