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

diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 82533b45bc8cd5afed5f515ac124c7a2f10452b4..901e42bdc8bdfc53291334971f58aef7b09aac96 100644 (file)
--- 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 97bed1b0899d43dee4bb0771bf3492edcf605739..231ecac80861a227f30690159c41cf6c58079315 100644 (file)
--- 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)))