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>
This commit is contained in:
Родитель
a535ad57d0
Коммит
8b169cb27c
|
@ -219,6 +219,8 @@ static int hal2_gain_get(struct snd_kcontrol *kcontrol,
|
|||
l = (tmp >> H2I_C2_L_GAIN_SHIFT) & 15;
|
||||
r = (tmp >> H2I_C2_R_GAIN_SHIFT) & 15;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
ucontrol->value.integer.value[0] = l;
|
||||
ucontrol->value.integer.value[1] = r;
|
||||
|
@ -256,6 +258,8 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol,
|
|||
new |= (r << H2I_C2_R_GAIN_SHIFT);
|
||||
hal2_i_write32(hal2, H2I_ADC_C2, new);
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
return old != new;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче