Commit bed515b0 authored by Harvey Harrison's avatar Harvey Harrison Committed by Takashi Iwai

[ALSA] sound: ca0106_mixer.c fix shadowed variable warnings

Change the variable err to _err within the ADD_CTLS macro to avoid
shadowing the local variable.

sound/pci/ca0106/ca0106_mixer.c:710:2: warning: symbol 'err' shadows an earlier one
sound/pci/ca0106/ca0106_mixer.c:663:6: originally declared here
sound/pci/ca0106/ca0106_mixer.c:712:3: warning: symbol 'err' shadows an earlier one
sound/pci/ca0106/ca0106_mixer.c:663:6: originally declared here
sound/pci/ca0106/ca0106_mixer.c:721:3: warning: symbol 'err' shadows an earlier one
sound/pci/ca0106/ca0106_mixer.c:663:6: originally declared here
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d967a027
......@@ -650,11 +650,11 @@ static int __devinit rename_ctl(struct snd_card *card, const char *src, const ch
#define ADD_CTLS(emu, ctls) \
do { \
int i, err; \
int i, _err; \
for (i = 0; i < ARRAY_SIZE(ctls); i++) { \
err = snd_ctl_add(card, snd_ctl_new1(&ctls[i], emu)); \
if (err < 0) \
return err; \
_err = snd_ctl_add(card, snd_ctl_new1(&ctls[i], emu)); \
if (_err < 0) \
return _err; \
} \
} while (0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment