Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 257749
b: refs/heads/master
c: 5c9a561
h: refs/heads/master
i:
  257747: e93d737
v: v3
  • Loading branch information
Lydia Wang authored and Takashi Iwai committed Jul 8, 2011
1 parent 47a4fdb commit 33ba426
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d69607b3c39bb46b7f838f7b683716d4c22ee353
refs/heads/master: 5c9a5615dedec19196b1217e864616a2ce9e392a
14 changes: 11 additions & 3 deletions trunk/sound/pci/hda/patch_via.c
Original file line number Diff line number Diff line change
Expand Up @@ -1716,18 +1716,21 @@ static int via_auto_fill_dac_nids(struct hda_codec *codec)
{
struct via_spec *spec = codec->spec;
const struct auto_pin_cfg *cfg = &spec->autocfg;
int i;
int i, dac_num;
hda_nid_t nid;

spec->multiout.dac_nids = spec->private_dac_nids;
spec->multiout.num_dacs = cfg->line_outs;
dac_num = 0;
for (i = 0; i < cfg->line_outs; i++) {
nid = cfg->line_out_pins[i];
if (!nid)
continue;
if (parse_output_path(codec, nid, 0, &spec->out_path[i]))
if (parse_output_path(codec, nid, 0, &spec->out_path[i])) {
spec->private_dac_nids[i] = spec->out_path[i].path[0];
dac_num++;
}
}
spec->multiout.num_dacs = dac_num;
return 0;
}

Expand Down Expand Up @@ -1838,6 +1841,10 @@ static int via_auto_create_multi_out_ctls(struct hda_codec *codec)
if (err < 0)
return err;

if (spec->multiout.num_dacs < 3) {
spec->smart51_nums = 0;
cfg->line_outs = old_line_outs;
}
for (i = 0; i < cfg->line_outs; i++) {
hda_nid_t pin, dac;
pin = cfg->line_out_pins[i];
Expand Down Expand Up @@ -3383,6 +3390,7 @@ static int patch_vt2002P(struct hda_codec *codec)
return -ENOMEM;

spec->aa_mix_nid = 0x21;
spec->dac_mixer_idx = 3;
override_mic_boost(codec, 0x2b, 0, 3, 40);
override_mic_boost(codec, 0x29, 0, 3, 40);

Expand Down

0 comments on commit 33ba426

Please sign in to comment.