diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:20:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:20:55 +0200 |
| commit | b3e30c9884407599353e690a4eb36d0c4671bf62 (patch) | |
| tree | d752d32d8a1a395cacd220313f24b933b2ed7294 /sound/soc/soc-core.c | |
| parent | 342061c53a049569fc7f56d237753c26b4b2166d (diff) | |
| parent | a55aa89aab90fae7c815b0551b07be37db359d76 (diff) | |
Merge tag 'v5.3-rc6' into x86/cpu, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 fd6eaae6c0ed..44f899b970c2 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1515,8 +1515,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) |