---------------------
PatchSet 3075 
Date: 2005/03/24 17:48:30
Author: tiwai
Branch: HEAD
Tag: (none) 
Log:
Summary: Skip ac97 SPDIF controls

Skip building ac97 SPDIF controls via AC97_SCAP_NO_SPDIF.
Clean up the code.

Members: 
	pci/ca0106/ca0106_main.c:1.5->1.6 
	pci/ca0106/ca0106_mixer.c:1.2->1.3 

Index: /sound/pci/ca0106/ca0106_main.c
diff -u /sound/pci/ca0106/ca0106_main.c.old /sound/pci/ca0106/ca0106_main.c
--- /sound/pci/ca0106/ca0106_main.c.old	Mon Mar 21 11:56:50 2005
+++ /sound/pci/ca0106/ca0106_main.c	Thu Mar 24 09:48:30 2005
@@ -810,6 +810,7 @@
 
 	memset(&ac97, 0, sizeof(ac97));
 	ac97.private_data = chip;
+	ac97.scaps = AC97_SCAP_NO_SPDIF;
 	return snd_ac97_mixer(pbus, &ac97, &chip->ac97);
 }
 
Index: /sound/pci/ca0106/ca0106_mixer.c
diff -u /sound/pci/ca0106/ca0106_mixer.c.old /sound/pci/ca0106/ca0106_mixer.c
--- /sound/pci/ca0106/ca0106_mixer.c.old	Sun Jan  9 23:33:03 2005
+++ /sound/pci/ca0106/ca0106_mixer.c	Thu Mar 24 09:48:30 2005
@@ -620,11 +620,6 @@
 		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)))