diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-01-16 08:27:57 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-01-16 08:33:42 -0500 |
commit | 8b169cb27c8267cd344fd71c2067ea864dd4c2e7 (patch) | |
tree | 670194069d4dc46c631186fde50cbc70bf238f59 /sound/mips | |
parent | a535ad57d0e6b959cd79914a1127caade36a9459 (diff) |
ALSA: mips: avoid potential uninitialized variable use
MIPS allmodconfig results in this warning:
sound/mips/hal2.c: In function 'hal2_gain_get':
sound/mips/hal2.c:224:35: error: 'r' may be used uninitialized in this function [-Werror=maybe-uninitialized]
sound/mips/hal2.c:223:35: error: 'l' may be used uninitialized in this function [-Werror=maybe-uninitialized]
sound/mips/hal2.c: In function 'hal2_gain_put':
sound/mips/hal2.c:260:13: error: 'new' may be used uninitialized in this function [-Werror=maybe-uninitialized]
sound/mips/hal2.c:260:13: error: 'old' may be used uninitialized in this function [-Werror=maybe-uninitialized]
Returning an error for all unexpected cases shuts up the warning
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/mips')
-rw-r--r-- | sound/mips/hal2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index ede449f0b50d..00fc9241d266 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c | |||
@@ -219,6 +219,8 @@ static int hal2_gain_get(struct snd_kcontrol *kcontrol, | |||
219 | l = (tmp >> H2I_C2_L_GAIN_SHIFT) & 15; | 219 | l = (tmp >> H2I_C2_L_GAIN_SHIFT) & 15; |
220 | r = (tmp >> H2I_C2_R_GAIN_SHIFT) & 15; | 220 | r = (tmp >> H2I_C2_R_GAIN_SHIFT) & 15; |
221 | break; | 221 | break; |
222 | default: | ||
223 | return -EINVAL; | ||
222 | } | 224 | } |
223 | ucontrol->value.integer.value[0] = l; | 225 | ucontrol->value.integer.value[0] = l; |
224 | ucontrol->value.integer.value[1] = r; | 226 | ucontrol->value.integer.value[1] = r; |
@@ -256,6 +258,8 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol, | |||
256 | new |= (r << H2I_C2_R_GAIN_SHIFT); | 258 | new |= (r << H2I_C2_R_GAIN_SHIFT); |
257 | hal2_i_write32(hal2, H2I_ADC_C2, new); | 259 | hal2_i_write32(hal2, H2I_ADC_C2, new); |
258 | break; | 260 | break; |
261 | default: | ||
262 | return -EINVAL; | ||
259 | } | 263 | } |
260 | return old != new; | 264 | return old != new; |
261 | } | 265 | } |