[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 9c8ac157791f888f927b3f43140e41a6550c3a1b..ff12de474d2ccde94a94dcebddc3993e9ebde9cd 100644 (file)
--- 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));