diff options
author | Takashi Iwai | 2019-08-06 12:28:08 +0200 |
---|---|---|
committer | Takashi Iwai | 2019-08-06 12:28:08 +0200 |
commit | c2913b140f901a705809f8b6c83998cf8147f848 (patch) | |
tree | 53686878548921b83e8d9db437c4437140561980 /sound/soc/soc-core.c | |
parent | ALSA: usb-audio: Fix gpf in snd_usb_pipe_sanity_check (diff) | |
parent | ASoC: amd: acp3x: use dma address for acp3x dma driver (diff) | |
download | kernel-qcow2-linux-c2913b140f901a705809f8b6c83998cf8147f848.tar.gz kernel-qcow2-linux-c2913b140f901a705809f8b6c83998cf8147f848.tar.xz kernel-qcow2-linux-c2913b140f901a705809f8b6c83998cf8147f848.zip |
Merge tag 'asoc-fix-v5.3-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.3
A relatively large batch of mostly unremarkable fixes here, a couple of
small core fixes for fairly obscure issues, more comment/email updates
with no code impact than usual and a bunch of small driver fixes.
The support for new sample rates in the max98373 driver is a fix for the
fact that the driver declared support for those rates but would in fact
return an error if these rates were selected.
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) |