ASoC: codec2codec: fix missing return of error return code

Currently in function snd_soc_dai_link_event_pre_pmu the error return
code in variable err is being set but this is not actually being returned,
the function just returns zero even when there are failures. Fix this by
returning the error return code.

Addresses-Coverity: ("Unused value")
Fixes: 3dcfb397dad2 ("ASoC: codec2codec: deal with params when necessary")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20190726123327.10467-1-colin.king@canonical.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index be9bb05b0165256d1111374087f7fbde4de442c8..2d183e2d23de12f2536a972926fc38ee3a8029d6 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3776,7 +3776,7 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w,
        struct snd_pcm_hw_params *params = NULL;
        const struct snd_soc_pcm_stream *config = NULL;
        unsigned int fmt;
-       int ret;
+       int ret = 0;
 
        params = kzalloc(sizeof(*params), GFP_KERNEL);
        if (!params)
@@ -3865,7 +3865,7 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w,
 
 out:
        kfree(params);
-       return 0;
+       return ret;
 }
 
 static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,