sound: ca0106_main.c fix shadowed variable warnings
PATCH 11/12 sound: ca0106_main.c fix shadowed variable warnings
change to intr_enable as per the two functions it is defined in. sound/pci/ca0106/ca0106_main.c:438:15: warning: symbol 'enable' shadows an earlier one sound/pci/ca0106/ca0106_main.c:159:12: originally declared here sound/pci/ca0106/ca0106_main.c:449:15: warning: symbol 'enable' shadows an earlier one sound/pci/ca0106/ca0106_main.c:159:12: originally declared here
Signed-off-by Harvey Harrison <[email protected]>
--- sound/pci/ca0106/ca0106_main.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
sound/pci/ca0106/ca0106_main.c +8 -8
@@ -435,22 +435,22 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu,static void snd_ca0106_intr_enable (struct snd_ca0106 *emu,unsigned int intrenb) {unsigned long flags; -unsigned int enable; - +unsigned int intr_enable; +spin_lock_irqsave (&emu->emu_lock, flags); - enable =inl (emu->port +INTE ) | intrenb; -outl (enable, emu->port +INTE ); + intr_enable =inl (emu->port +INTE ) | intrenb; +outl (intr_enable, emu->port +INTE );spin_unlock_irqrestore (&emu->emu_lock, flags); }static void snd_ca0106_intr_disable (struct snd_ca0106 *emu,unsigned int intrenb) {unsigned long flags; -unsigned int enable; - +unsigned int intr_enable; +spin_lock_irqsave (&emu->emu_lock, flags); - enable =inl (emu->port +INTE ) & ~intrenb; -outl (enable, emu->port +INTE ); + intr_enable =inl (emu->port +INTE ) & ~intrenb; +outl (intr_enable, emu->port +INTE );spin_unlock_irqrestore (&emu->emu_lock, flags); }
Signature · 1 line
1.5.4.3.342.g99e8