[ALSA] emu10k1 - Don't create emu1010 controls for non-emu boards

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Linux Kernel Mailing List
Date: Thursday, January 31, 2008 - 5:04 pm

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=88aa13...
Commit:     88aa139057f2740c5dd55e2a542b2425186e4d3c
Parent:     1c02e36681ae20a796204e8d629d13fa9d5e20b5
Author:     Takashi Iwai <tiwai@suse.de>
AuthorDate: Fri Dec 21 16:20:12 2007 +0100
Committer:  Mercurial server <hg@alsa0.alsa-project.org>
CommitDate: Thu Jan 31 17:30:24 2008 +0100

    [ALSA] emu10k1 - Don't create emu1010 controls for non-emu boards
    
    The last change for emu1616 introduced a bug that the driver creates
    emu1010-related controls even on non-emu boards.  Fixed now.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 sound/pci/emu10k1/emumixer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 9b5883b..7ebf035 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -2026,7 +2026,7 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
 		if (err < 0)
 			return err;
 
-	} else {
+	} else if (emu->card_capabilities->emu_model) {
 		/* all other e-mu cards for now */
 		int i;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[ALSA] emu10k1 - Don't create emu1010 controls for non-emu ..., Linux Kernel Mailing ..., (Thu Jan 31, 5:04 pm)