lkml.org 
[lkml]   [2019]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 102/205] ASoC: dapm: Avoid uninitialised variable warning
    Date
    From: Charles Keepax <ckeepax@opensource.cirrus.com>

    [ Upstream commit fc269c0396448cabe1afd648c0b335669aa347b7 ]

    Commit 4a75aae17b2a ("ASoC: dapm: Add support for multi-CODEC
    CODEC to CODEC links") adds loops that iterate over multiple
    CODECs in snd_soc_dai_link_event. This also introduced a compiler
    warning for a potentially uninitialised variable in the case
    no CODECs are present. This should never be the case as the
    DAI link must by definition contain at least 1 CODEC however
    probably best to avoid the compiler warning by initialising ret
    to zero.

    Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/soc-dapm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
    index ff31d9f9ecd64..7f0b48b363809 100644
    --- a/sound/soc/soc-dapm.c
    +++ b/sound/soc/soc-dapm.c
    @@ -3684,7 +3684,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
    struct snd_pcm_hw_params *params = NULL;
    struct snd_pcm_runtime *runtime = NULL;
    unsigned int fmt;
    - int ret;
    + int ret = 0;

    if (WARN_ON(!config) ||
    WARN_ON(list_empty(&w->edges[SND_SOC_DAPM_DIR_OUT]) ||
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-08 13:09    [W:4.021 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site