]> err.no Git - linux-2.6/commit
[ALSA] sound: emu10k1x.c fix shadowed variable warnings
authorHarvey Harrison <harvey.harrison@gmail.com>
Fri, 29 Feb 2008 10:44:57 +0000 (11:44 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 24 Apr 2008 10:00:18 +0000 (12:00 +0200)
commitf2948fc2f0e1c19b8bea77a14338d338e941ac9a
treef44d4c8676bbf6cae2226814c49ac26f9c68f036
parent4677df07e551d64167f64eba5e3563b3df7f4ca8
[ALSA] sound: emu10k1x.c fix shadowed variable warnings

enable in these contexts refers specifically to intr enable, as
per the two functions it is found in.  Use intr_enable instead.
sound/pci/emu10k1/emu10k1x.c:330:15: warning: symbol 'enable' shadows an earlier one
sound/pci/emu10k1/emu10k1x.c:53:12: originally declared here
sound/pci/emu10k1/emu10k1x.c:341:15: warning: symbol 'enable' shadows an earlier one
sound/pci/emu10k1/emu10k1x.c:53:12: originally declared here

instead of shadowing, use cap_voice as we test for the capture
voice in this statement.
sound/pci/emu10k1/emu10k1x.c:798:25: warning: symbol 'pvoice' shadows an earlier one
sound/pci/emu10k1/emu10k1x.c:787:24: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/emu10k1/emu10k1x.c