From 43ea1d478fe5eaf4441263cf6ddad7dd05e1a399 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 26 Apr 2007 19:12:08 +0200 Subject: [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 Signed-off-by: Jaroslav Kysela --- sound/pci/hda/hda_codec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sound') diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 9c8ac157791..ff12de474d2 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)); -- cgit v1.2.3-70-g09d2