diff options
| author | James Courtier-Dutton <James@superbug.co.uk> | 2007-11-04 14:08:26 +0000 |
|---|---|---|
| committer | Mercurial server <hg@alsa0.alsa-project.org> | 2008-01-31 17:30:24 +0100 |
| commit | 190d2c46e52592ba092e8bf8acd4427c920f2d69 (patch) | |
| tree | bc4f4271f08aa57ac520fa2536c3990f8741fd55 /sound/pci/emu10k1/emumixer.c | |
| parent | 44893a36ba49349e0f9d4bc3b7bbf9b54469ae1a (diff) | |
| download | blackbird-op-linux-190d2c46e52592ba092e8bf8acd4427c920f2d69.tar.gz blackbird-op-linux-190d2c46e52592ba092e8bf8acd4427c920f2d69.zip | |
[ALSA] snd:emu10k1: E-Mu updates. Fixes to firmware loading and support for 0404.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/emu10k1/emumixer.c')
| -rw-r--r-- | sound/pci/emu10k1/emumixer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 5a38fe71e52f..83acfa6e9317 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -1792,7 +1792,7 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu, return err; } - if ( emu->card_capabilities->emu1010) { + if (emu->card_capabilities->emu_model) { ; /* Disable the snd_audigy_spdif_shared_spdif */ } else if (emu->audigy) { if ((kctl = snd_ctl_new1(&snd_audigy_shared_spdif, emu)) == NULL) @@ -1817,7 +1817,7 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu, return err; } - if ( emu->card_capabilities->emu1010) { + if (emu->card_capabilities->emu_model) { int i; for (i = 0; i < ARRAY_SIZE(snd_emu1010_output_enum_ctls); i++) { |
