Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 257728
b: refs/heads/master
c: c4394f5
h: refs/heads/master
v: v3
  • Loading branch information
Lydia Wang authored and Takashi Iwai committed Jul 4, 2011
1 parent d7474e1 commit af89f60
Show file tree
Hide file tree
Showing 2 changed files with 5 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: e5e14681404ec27a422d635284bf564dabde3f81
refs/heads/master: c4394f5b807289c180a486df70c1a9b1f192f1cb
4 changes: 4 additions & 0 deletions trunk/sound/pci/hda/patch_via.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ struct via_spec {
hda_nid_t hp_dac_nid;
bool hp_indep_shared; /* indep HP-DAC is shared with side ch */
int num_active_streams;
int dac_mixer_idx;

struct nid_path out_path[4];
struct nid_path hp_path;
Expand Down Expand Up @@ -1810,6 +1811,8 @@ static int via_auto_create_multi_out_ctls(struct hda_codec *codec)

idx = get_connection_index(codec, spec->aa_mix_nid,
spec->multiout.dac_nids[0]);
if (idx < 0 && spec->dac_mixer_idx)
idx = spec->dac_mixer_idx;
if (idx >= 0) {
/* add control to mixer */
err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
Expand Down Expand Up @@ -2959,6 +2962,7 @@ static int patch_vt1718S(struct hda_codec *codec)
spec->aa_mix_nid = 0x21;
override_mic_boost(codec, 0x2b, 0, 3, 40);
override_mic_boost(codec, 0x29, 0, 3, 40);
spec->dac_mixer_idx = 5;

/* automatic parse from the BIOS config */
err = via_parse_auto_config(codec);
Expand Down

0 comments on commit af89f60

Please sign in to comment.