From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 21 Dec 2007 15:20:12 +0000 (+0100)
Subject: [ALSA] emu10k1 - Don't create emu1010 controls for non-emu boards
X-Git-Tag: v2.6.25-rc1~1127^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=88aa139057f2740c5dd55e2a542b2425186e4d3c;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 9b5883b7957..7ebf035b6b0 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;