mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-09-22 12:42:50 +00:00
[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:
parent
b7dd2b349a
commit
43ea1d478f
1 changed files with 2 additions and 1 deletions
|
@ -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));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue