diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-02-28 06:02:56 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:17 -0400 |
commit | bed515b0dfdcf8f440c7e6c5bad8ce3eb96fb625 (patch) | |
tree | 8f5b0755cb4b2b192f1115833528f27b654e29e1 /sound/pci/ca0106/ca0106_mixer.c | |
parent | d967a02712f09265b3c357f35f125715f5dffd2f (diff) |
[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: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ca0106/ca0106_mixer.c')
-rw-r--r-- | sound/pci/ca0106/ca0106_mixer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index 94618ecaab65..3025ed1b6e1e 100644 --- a/sound/pci/ca0106/ca0106_mixer.c +++ b/sound/pci/ca0106/ca0106_mixer.c | |||
@@ -650,11 +650,11 @@ static int __devinit rename_ctl(struct snd_card *card, const char *src, const ch | |||
650 | 650 | ||
651 | #define ADD_CTLS(emu, ctls) \ | 651 | #define ADD_CTLS(emu, ctls) \ |
652 | do { \ | 652 | do { \ |
653 | int i, err; \ | 653 | int i, _err; \ |
654 | for (i = 0; i < ARRAY_SIZE(ctls); i++) { \ | 654 | for (i = 0; i < ARRAY_SIZE(ctls); i++) { \ |
655 | err = snd_ctl_add(card, snd_ctl_new1(&ctls[i], emu)); \ | 655 | _err = snd_ctl_add(card, snd_ctl_new1(&ctls[i], emu)); \ |
656 | if (err < 0) \ | 656 | if (_err < 0) \ |
657 | return err; \ | 657 | return _err; \ |
658 | } \ | 658 | } \ |
659 | } while (0) | 659 | } while (0) |
660 | 660 | ||