Commit 1fa335b0 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Add missing badness evaluation for unresolved paths

When a patch couldn't be resolved in try_assign_dacs() although the
target DAC is expected, we forgot to add a proper badness value but
continued.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9314a581
...@@ -1105,14 +1105,17 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs, ...@@ -1105,14 +1105,17 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs,
else else
badness += bad->no_dac; badness += bad->no_dac;
} }
if (!dac)
continue;
path = snd_hda_add_new_path(codec, dac, pin, -spec->mixer_nid); path = snd_hda_add_new_path(codec, dac, pin, -spec->mixer_nid);
if (!path && !i && spec->mixer_nid) { if (!path && !i && spec->mixer_nid) {
/* try with aamix */ /* try with aamix */
path = snd_hda_add_new_path(codec, dac, pin, 0); path = snd_hda_add_new_path(codec, dac, pin, 0);
} }
if (!path) if (!path) {
dac = dacs[i] = 0; dac = dacs[i] = 0;
else { badness += bad->no_dac;
} else {
/* print_nid_path("output", path); */ /* print_nid_path("output", path); */
path->active = true; path->active = true;
path_idx[i] = snd_hda_get_path_idx(codec, path); path_idx[i] = snd_hda_get_path_idx(codec, path);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment