Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[linux-2.6-omap-h63xx.git] / sound / pci / ca0106 / ca0106_mixer.c

diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index 94618ecaab65ff64f71cc01859b9b4ea12ffee3a..3025ed1b6e1efd1444ccf5d3403d4ca7ab36627c 100644 (file)
--- 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)