[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.67,1.68

[Takashi I. <ti...@us...>]

Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv30289/pci/ac97

Modified Files:
	ac97_codec.c 
Log Message:
- added the name field to ac97 quirk list.
- fixed the ac97_tune_harware().



Index: ac97_codec.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ac97_codec.c	18 Feb 2003 16:41:25 -0000	1.67
+++ ac97_codec.c	20 Feb 2003 11:00:39 -0000	1.68
@@ -2477,6 +2477,7 @@
 	snd_ctl_elem_id_t id;
 	memset(&id, 0, sizeof(id));
 	strcpy(id.name, name);
+	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
 	return snd_ctl_remove_id(ac97->card, &id);
 }
 
@@ -2485,8 +2486,10 @@
 	snd_ctl_elem_id_t sid, did;
 	memset(&sid, 0, sizeof(sid));
 	strcpy(sid.name, src);
+	sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
 	memset(&did, 0, sizeof(did));
 	strcpy(did.name, dst);
+	did.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
 	return snd_ctl_rename_id(ac97->card, &sid, &did);
 }
 
@@ -2530,14 +2533,14 @@
 
 	for (; quirk->vendor; quirk++) {
 		if (quirk->vendor == vendor && quirk->device == device) {
-			snd_printdd("ac97 quirk for %04x:%04x\n", vendor, device);
+			snd_printdd("ac97 quirk for %s (%04x:%04x)\n", quirk->name, vendor, device);
 			switch (quirk->type) {
 			case AC97_TUNE_HP_ONLY:
 				return swap_headphone(ac97, 1);
 			case AC97_TUNE_SWAP_HP:
 				return swap_headphone(ac97, 0);
 			}
-			snd_printk(KERN_ERR "invalid quirk type %d\n", quirk->type);
+			snd_printk(KERN_ERR "invalid quirk type %d for %s\n", quirk->type, quirk->name);
 			return -EINVAL;
 		}
 	}