[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>
This commit is contained in:
Takashi Iwai 2007-04-26 19:12:08 +02:00 committed by Jaroslav Kysela
parent b7dd2b349a
commit 43ea1d478f

View file

@ -576,7 +576,8 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
} }
codec->preset = find_codec_preset(codec); 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, snd_hda_get_codec_name(codec, bus->card->mixername,
sizeof(bus->card->mixername)); sizeof(bus->card->mixername));