ALSA: hda - Avoid duplicated path creations

When the paths are created in map_singles(), we don't have to
re-create new paths in try_assign_dacs().  Just evaluate the badness
and skip to the next item.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2013-01-04 12:56:52 +01:00
parent e1284af730
commit 1e0b528696

View file

@ -833,8 +833,13 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs,
for (i = 0; i < num_outs; i++) {
struct nid_path *path;
hda_nid_t pin = pins[i];
if (!dacs[i])
dacs[i] = look_for_dac(codec, pin, false);
if (dacs[i]) {
badness += assign_out_path_ctls(codec, pin, dacs[i]);
continue;
}
dacs[i] = look_for_dac(codec, pin, false);
if (!dacs[i] && !i) {
for (j = 1; j < num_outs; j++) {
if (is_reachable_path(codec, dacs[j], pin)) {