summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-02-28 12:02:56 +0100
committerTakashi Iwai <tiwai@suse.de>2008-04-24 12:00:17 +0200
commitbed515b0dfdcf8f440c7e6c5bad8ce3eb96fb625 (patch)
tree8f5b0755cb4b2b192f1115833528f27b654e29e1 /sound/pci
parentd967a02712f09265b3c357f35f125715f5dffd2f (diff)
downloadblackbird-op-linux-bed515b0dfdcf8f440c7e6c5bad8ce3eb96fb625.tar.gz
blackbird-op-linux-bed515b0dfdcf8f440c7e6c5bad8ce3eb96fb625.zip
[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')
-rw-r--r--sound/pci/ca0106/ca0106_mixer.c8
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
#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)
OpenPOWER on IntegriCloud