---

yaml --- r: 56191 b: refs/heads/master c: 43ea1d4 h: refs/heads/master i: 56189: fe4a7a3 56187: d66e59c 56183: 00341c2 56175: a2f01f6 56159: 5efd8f8 56127: 0403f3f 56063: 88196c3 v: v3
git-mirror · May 11, 2007 · 94a04c7 · 94a04c7
1 parent 5223e03
commit 94a04c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7dd2b349a9fa9e4347780c2bbb41e51484b5bb5
+refs/heads/master: 43ea1d478fe5eaf4441263cf6ddad7dd05e1a399
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
@@ -576,7 +576,8 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
 	}
 
 	codec->preset = find_codec_preset(codec);
-	if (!*bus->card->mixername)
+	/* audio codec should override the mixer name */
+	if (codec->afg || !*bus->card->mixername)
 		snd_hda_get_codec_name(codec, bus->card->mixername,
 				       sizeof(bus->card->mixername));