aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2007-04-26 13:12:08 -0400
committerJaroslav Kysela <perex@suse.cz>2007-05-11 10:56:12 -0400
commit43ea1d478fe5eaf4441263cf6ddad7dd05e1a399 (patch)
treee54f670f6040759571472e949192382ccb4051f9 /sound/pci/hda/hda_codec.c
parentb7dd2b349a9fa9e4347780c2bbb41e51484b5bb5 (diff)
[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>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r--sound/pci/hda/hda_codec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 9c8ac157791f..ff12de474d2c 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,
576 } 576 }
577 577
578 codec->preset = find_codec_preset(codec); 578 codec->preset = find_codec_preset(codec);
579 if (!*bus->card->mixername) 579 /* audio codec should override the mixer name */
580 if (codec->afg || !*bus->card->mixername)
580 snd_hda_get_codec_name(codec, bus->card->mixername, 581 snd_hda_get_codec_name(codec, bus->card->mixername,
581 sizeof(bus->card->mixername)); 582 sizeof(bus->card->mixername));
582 583