Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 117688a9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Correct aamix output paths 



The output paths including aamix should be parsed only for the first
output.  The surround paths including aamix must be wrong, since it
would mix all streams, i.e. all channels would be mixed into a single
and multiplexed again.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2430d7b7

sound/pci/hda/hda_generic.c

+2 −2
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs, 
				badness += bad->no_dac;

		}

		path = snd_hda_add_new_path(codec, dac, pin, HDA_PARSE_NO_AAMIX);

		if (!path && i > 0 && spec->mixer_nid) {

		if (!path && !i && spec->mixer_nid) {

			/* try with aamix */

			path = snd_hda_add_new_path(codec, dac, pin, HDA_PARSE_ALL);

		}
@@ -1102,7 +1102,7 @@ static bool map_singles(struct hda_codec *codec, int outs, 
		if (!dac)

			continue;

		path = snd_hda_add_new_path(codec, dac, pins[i], HDA_PARSE_NO_AAMIX);

		if (!path && i > 0 && spec->mixer_nid)

		if (!path && !i && spec->mixer_nid)

			path = snd_hda_add_new_path(codec, dac, pins[i], HDA_PARSE_ALL);

		if (path) {

			dacs[i] = dac;