Skip to content

Commit

Permalink
[ALSA] sound: ca0106_mixer.c fix shadowed variable warnings
Browse files Browse the repository at this point in the history
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: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Harvey Harrison authored and Takashi Iwai committed Apr 24, 2008
1 parent d967a02 commit bed515b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sound/pci/ca0106/ca0106_mixer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit bed515b

Please sign in to comment.