lkml.org 
[lkml]   [2019]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 035/162] ASoC: Fail card instantiation if DAI format setup fails
    Date
    [ Upstream commit 40aa5383e393d72f6aa3943a4e7b1aae25a1e43b ]

    If the DAI format setup fails, there is no valid communication format
    between CPU and CODEC, so fail card instantiation, rather than continue
    with a card that will most likely not function properly.

    Signed-off-by: Ricard Wanderlof <ricardw@axis.com>
    Link: https://lore.kernel.org/r/alpine.DEB.2.20.1907241132350.6338@lnxricardw1.se.axis.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/soc-core.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
    index 6aeba0d66ec50..dd0f43a1c5e14 100644
    --- a/sound/soc/soc-core.c
    +++ b/sound/soc/soc-core.c
    @@ -1605,8 +1605,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)
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-08-27 10:11    [W:4.041 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site