aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/pci/ca0106/ca0106_main.c1
-rw-r--r--sound/pci/ca0106/ca0106_mixer.c5
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)
810 810
811 memset(&ac97, 0, sizeof(ac97)); 811 memset(&ac97, 0, sizeof(ac97));
812 ac97.private_data = chip; 812 ac97.private_data = chip;
813 ac97.scaps = AC97_SCAP_NO_SPDIF;
813 return snd_ac97_mixer(pbus, &ac97, &chip->ac97); 814 return snd_ac97_mixer(pbus, &ac97, &chip->ac97);
814} 815}
815 816
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)))