Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d967a027 authored by Harvey Harrison's avatar Harvey Harrison Committed by Takashi Iwai
Browse files

[ALSA] 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: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c74056d4

sound/pci/ca0106/ca0106_main.c

+8 −8
Original line number Diff line number Diff line
@@ -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);

}