]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Revert "ASoC: Fail card instantiation if DAI format setup fails"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Sep 2019 18:48:46 +0000 (20:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Sep 2019 08:23:52 +0000 (10:23 +0200)
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>
sound/soc/soc-core.c

index dd0f43a1c5e1409986f0bde6423b1526f35a7b07..6aeba0d66ec500785a287dbcdc225d5a309213ae 100644 (file)
@@ -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)