diff options
author | James Courtier-Dutton <James@superbug.co.uk> | 2005-12-04 18:03:03 +0100 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 12:30:15 +0100 |
commit | 19b99fbaed2e2971b756311435c67e84431d8515 (patch) | |
tree | 78f0c968f8bed1a5ce82edd00d793be6f3a73d4c /sound/pci/emu10k1/emumixer.c | |
parent | 481ba7727fa08deb389b5a2e550e04df24d3f37d (diff) | |
download | talos-obmc-linux-19b99fbaed2e2971b756311435c67e84431d8515.tar.gz talos-obmc-linux-19b99fbaed2e2971b756311435c67e84431d8515.zip |
[ALSA] emu10k1: Partial support for Creative emu1212m
Modules: EMU10K1/EMU10K2 driver
Distorted sound now comes from the Audio Out socket. Still more work to do.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Diffstat (limited to 'sound/pci/emu10k1/emumixer.c')
-rw-r--r-- | sound/pci/emu10k1/emumixer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 98fb8139427b..306fe4aa4aa5 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -959,7 +959,9 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu, return err; } - if (emu->audigy) { + if ( emu->card_capabilities->emu1212m) { + ; /* Disable the snd_audigy_spdif_shared_spdif */ + } else if (emu->audigy) { if ((kctl = snd_ctl_new1(&snd_audigy_shared_spdif, emu)) == NULL) return -ENOMEM; if ((err = snd_ctl_add(card, kctl))) |