Skip to content

Commit

Permalink
[ALSA] hda-codec - Prefer audio codec name as the mixer name
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed May 11, 2007
1 parent b7dd2b3 commit 43ea1d4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion sound/pci/hda/hda_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down

0 comments on commit 43ea1d4

Please sign in to comment.