Skip to content

Commit

Permalink
ALSA: hda - Correct aamix output paths
Browse files Browse the repository at this point in the history
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: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Jan 12, 2013
1 parent 2430d7b commit 117688a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/pci/hda/hda_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 117688a

Please sign in to comment.