diff --git a/[refs] b/[refs]
index 5eb4f482adff..b7640a64c38f 100644
--- 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
index 9c8ac157791f..ff12de474d2c 100644
--- 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));