openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: hda - Make sure fill_all_dac_nids is called for digital only codecs 

Otherwise no PCM will be built for codecs without analog I/O.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
David Henningsson 2013-01-16 15:58:45 +01:00 committed by Takashi Iwai
parent 99a5592d6a
commit 6fc4cb97cb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/pci/hda/hda_generic.c
View File

@ -1516,8 +1516,6 @@ static int parse_output_paths(struct hda_codec *codec)
bool best_wired = true, best_mio = true; bool best_wired = true, best_mio = true;
bool hp_spk_swapped = false; bool hp_spk_swapped = false;
fill_all_dac_nids(codec);
best_cfg = kmalloc(sizeof(*best_cfg), GFP_KERNEL); best_cfg = kmalloc(sizeof(*best_cfg), GFP_KERNEL);
if (!best_cfg) if (!best_cfg)
return -ENOMEM; return -ENOMEM;
@ -3428,6 +3426,8 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec,
cfg = &spec->autocfg; cfg = &spec->autocfg;
} }
fill_all_dac_nids(codec);
if (!cfg->line_outs) { if (!cfg->line_outs) {
if (cfg->dig_outs || cfg->dig_in_pin) { if (cfg->dig_outs || cfg->dig_in_pin) {
spec->multiout.max_channels = 2; spec->multiout.max_channels = 2;