diff options
| author | Takashi Iwai <tiwai@suse.de> | 2005-03-24 17:48:30 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-05-29 09:00:18 +0200 |
| commit | 36c4dc42249e96f0b0ddc90ca400bcb3981dbc62 (patch) | |
| tree | 64ab200ef36d9719a14f667d26ec969d7918dd89 | |
| parent | c301098233bdbaae369bfdd98207db916df8cef2 (diff) | |
| download | linux-36c4dc42249e96f0b0ddc90ca400bcb3981dbc62.tar.gz linux-36c4dc42249e96f0b0ddc90ca400bcb3981dbc62.tar.bz2 linux-36c4dc42249e96f0b0ddc90ca400bcb3981dbc62.zip | |
[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>
| -rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 1 | ||||
| -rw-r--r-- | sound/pci/ca0106/ca0106_mixer.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 82533b45bc8c..901e42bdc8bd 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c @@ -810,6 +810,7 @@ static int snd_ca0106_ac97(ca0106_t *chip) memset(&ac97, 0, sizeof(ac97)); ac97.private_data = chip; + ac97.scaps = AC97_SCAP_NO_SPDIF; return snd_ac97_mixer(pbus, &ac97, &chip->ac97); } 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) return -ENOMEM; if ((err = snd_ctl_add(card, kctl))) return err; - if ((kctl = ctl_find(card, SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT))) != NULL) { - /* already defined by ac97, remove it */ - /* FIXME: or do we need both controls? */ - remove_ctl(card, SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT)); - } if ((kctl = snd_ctl_new1(&snd_ca0106_spdif_control, emu)) == NULL) return -ENOMEM; if ((err = snd_ctl_add(card, kctl))) |