From: Greg Kroah-Hartman Date: Thu, 5 Sep 2019 18:48:46 +0000 (+0200) Subject: Revert "ASoC: Fail card instantiation if DAI format setup fails" X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e474227ad97a4d6885812777975b1e7386678277;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Revert "ASoC: Fail card instantiation if DAI format setup fails" This reverts commit a56c79efe4dc8ae560eb2c9a4b755d57c8c2e8f4 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 Cc: Ricard Wanderlof Cc: Sasha Levin Link: https://lore.kernel.org/lkml/20190904181027.GG4348@sirena.co.uk Signed-off-by: Greg Kroah-Hartman --- diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index ff5206f5455d..42c2a3065b77 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1757,11 +1757,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)