| Message ID | 20160827112801.31010-2-wens@csie.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 01ad5e7de67b408d9b48b437b06a9938ddf460b5 |
| Headers | show |
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 8698c26773b3..0b442fee0b62 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3049,6 +3049,9 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol, } mutex_unlock(&card->dapm_mutex); + if (ret) + return ret; + if (invert) ucontrol->value.integer.value[0] = max - val; else
If soc_dapm_read() fails, val will be uninitialized, and bogus values will be written later: ret = soc_dapm_read(dapm, reg, &val); val = (val >> shift) & mask; However, the compiler does not give a warning. Return on error before val is really used to avoid this. This is similar to the commit 6912831623c5 ("ASoC: dapm: Fix uninitialized variable in snd_soc_dapm_get_enum_double()") Fixes: ce0fc93ae56e ("ASoC: Add DAPM support at the component level") Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- sound/soc/soc-dapm.c | 3 +++ 1 file changed, 3 insertions(+)