diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-05 20:48:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-06 10:23:52 +0200 |
| commit | 5566d1c61b2fd9a8710e19a18e5e77557c3c21fe (patch) | |
| tree | 9de209852415682c2cc85758659a49933ead0467 /sound | |
| parent | 4d8966020827bb83197f995af58ec7e976113d62 (diff) | |
| download | linux-stable-5566d1c61b2fd9a8710e19a18e5e77557c3c21fe.tar.gz linux-stable-5566d1c61b2fd9a8710e19a18e5e77557c3c21fe.tar.bz2 linux-stable-5566d1c61b2fd9a8710e19a18e5e77557c3c21fe.zip | |
Revert "ASoC: Fail card instantiation if DAI format setup fails"
This reverts commit ab4f4d331a982f52a964f7f4d1ec452280f122e7 which is
commit 40aa5383e393d72f6aa3943a4e7b1aae25a1e43b upstream.
Mark Brown writes:
I nacked this patch when Sasha posted it - it only improves
diagnostics and might make systems that worked by accident break
since it turns things into a hard failure, it won't make
anything that didn't work previously work.
Reported-by: Mark Brown <broonie@kernel.org>
Cc: Ricard Wanderlof <ricardw@axis.com>
Cc: Sasha Levin <sashal@kernel.org>
Link: https://lore.kernel.org/lkml/20190904181027.GG4348@sirena.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index dd0f43a1c5e1..6aeba0d66ec5 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1605,11 +1605,8 @@ static int soc_probe_link_dais(struct snd_soc_card *card, } } - if (dai_link->dai_fmt) { - ret = snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt); - if (ret) - return ret; - } + if (dai_link->dai_fmt) + snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt); ret = soc_post_component_init(rtd, dai_link->name); if (ret) |