diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-03-24 11:48:30 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-05-29 03:00:18 -0400 |
commit | 36c4dc42249e96f0b0ddc90ca400bcb3981dbc62 (patch) | |
tree | 64ab200ef36d9719a14f667d26ec969d7918dd89 /sound/pci/ca0106/ca0106_mixer.c | |
parent | c301098233bdbaae369bfdd98207db916df8cef2 (diff) |
[ALSA] Skip ac97 SPDIF controls
CA0106 driver
Skip building ac97 SPDIF controls via AC97_SCAP_NO_SPDIF.
Clean up the code.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ca0106/ca0106_mixer.c')
-rw-r--r-- | sound/pci/ca0106/ca0106_mixer.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index 97bed1b0899d..231ecac80861 100644 --- a/sound/pci/ca0106/ca0106_mixer.c +++ b/sound/pci/ca0106/ca0106_mixer.c | |||
@@ -620,11 +620,6 @@ int __devinit snd_ca0106_mixer(ca0106_t *emu) | |||
620 | return -ENOMEM; | 620 | return -ENOMEM; |
621 | if ((err = snd_ctl_add(card, kctl))) | 621 | if ((err = snd_ctl_add(card, kctl))) |
622 | return err; | 622 | return err; |
623 | if ((kctl = ctl_find(card, SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT))) != NULL) { | ||
624 | /* already defined by ac97, remove it */ | ||
625 | /* FIXME: or do we need both controls? */ | ||
626 | remove_ctl(card, SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT)); | ||
627 | } | ||
628 | if ((kctl = snd_ctl_new1(&snd_ca0106_spdif_control, emu)) == NULL) | 623 | if ((kctl = snd_ctl_new1(&snd_ca0106_spdif_control, emu)) == NULL) |
629 | return -ENOMEM; | 624 | return -ENOMEM; |
630 | if ((err = snd_ctl_add(card, kctl))) | 625 | if ((err = snd_ctl_add(card, kctl))) |