From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 26 Apr 2007 17:12:08 +0000 (+0200)
Subject: [ALSA] hda-codec - Prefer audio codec name as the mixer name
X-Git-Tag: v2.6.22-rc1~22^2~24
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43ea1d478fe5eaf4441263cf6ddad7dd05e1a399;p=linux-2.6

[ALSA] hda-codec - Prefer audio codec name as the mixer name

Prefer the name of audio codecs as the mixer name even if
modem codecs are probed before the audio codecs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
---

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 9c8ac15779..ff12de474d 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/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));