From 94a04c7741bef8a6ee758f9407a53f904fcbea23 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 26 Apr 2007 19:12:08 +0200
Subject: [PATCH] --- yaml --- r: 56191 b: refs/heads/master c:
 43ea1d478fe5eaf4441263cf6ddad7dd05e1a399 h: refs/heads/master i:   56189:
 fe4a7a38e699c2fc436ed93cbbc1ae6263dbebcd   56187:
 d66e59c84b617d00de576cb75c7258304a0e1a6f   56183:
 00341c266eea5f005681e37394f47775d18c4251   56175:
 a2f01f685dbbdcbd3b138a0b1bab0ea09cc68c50   56159:
 5efd8f837f0da404eeb30733b4cccb1dc0598f7e   56127:
 0403f3fbba93d65e7d12d50341fbaa19fe491960   56063:
 88196c36e75b2f041a28ebacb612c9be93c1bd9c v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_codec.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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));