Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353073
b: refs/heads/master
c: b3a8c74
h: refs/heads/master
i:
  353071: c662561
v: v3
  • Loading branch information
Takashi Iwai committed Jan 12, 2013
1 parent e4a644f commit f7d3542
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4ac0eefa761f62b07d4b96884cf1acc625d7063f
refs/heads/master: b3a8c74522ae7c992cd916c3bd4b685d742c0e2a
7 changes: 7 additions & 0 deletions trunk/sound/pci/hda/hda_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,10 @@ 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) {
/* try with aamix */
path = snd_hda_add_new_path(codec, dac, pin, HDA_PARSE_ALL);
}
if (!path)
dac = dacs[i] = 0;
else
Expand Down Expand Up @@ -1020,6 +1024,7 @@ static int fill_multi_ios(struct hda_codec *codec,
static bool map_singles(struct hda_codec *codec, int outs,
const hda_nid_t *pins, hda_nid_t *dacs)
{
struct hda_gen_spec *spec = codec->spec;
int i;
bool found = false;
for (i = 0; i < outs; i++) {
Expand All @@ -1031,6 +1036,8 @@ 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)
path = snd_hda_add_new_path(codec, dac, pins[i], HDA_PARSE_ALL);
if (path) {
dacs[i] = dac;
found = true;
Expand Down

0 comments on commit f7d3542

Please sign in to comment.