diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-26 13:10:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-26 13:10:09 +0100 |
| commit | 3b46a67af2eb8214a634a37c485146ca0ef42849 (patch) | |
| tree | 1fef31dfdf401819f71158ad28ba87e7c8c4d886 /sound/soc/soc-core.c | |
| parent | 3dcfb397dad2ad55bf50de3c5d5a57090d35a18a (diff) | |
| parent | 1e112c35e3c96db7c8ca6ddaa96574f00c06e7db (diff) | |
| download | linux-3b46a67af2eb8214a634a37c485146ca0ef42849.tar.bz2 | |
Merge branch 'asoc-5.3' into asoc-5.4
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 7ecfe641ca46..06697b2d96b1 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1511,8 +1511,11 @@ static int soc_probe_link_dais(struct snd_soc_card *card, } } - if (dai_link->dai_fmt) - snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt); + if (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); if (ret) |