Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 170286
b: refs/heads/master
c: 9645c20
h: refs/heads/master
v: v3
  • Loading branch information
Lydia Wang authored and Takashi Iwai committed Oct 11, 2009
1 parent aa42b13 commit 93e2142
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 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: c873cc25280113d71463ad5075413d283be6b766
refs/heads/master: 9645c2039d5cfdbdcebe297420e180b6cd262836
9 changes: 4 additions & 5 deletions trunk/sound/pci/hda/patch_via.c
Original file line number Diff line number Diff line change
Expand Up @@ -1553,7 +1553,7 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
{
char name[32];
static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };
hda_nid_t nid, nid_vol = 0;
hda_nid_t nid, nid_vol, nid_vols[] = {0x17, 0x19, 0x1a, 0x1b};
int i, err;

for (i = 0; i <= AUTO_SEQ_SIDE; i++) {
Expand All @@ -1562,8 +1562,7 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
if (!nid)
continue;

if (i != AUTO_SEQ_FRONT)
nid_vol = 0x18 + i;
nid_vol = nid_vols[i];

if (i == AUTO_SEQ_CENLFE) {
/* Center/LFE */
Expand Down Expand Up @@ -1595,13 +1594,13 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
/* add control to mixer index 0 */
err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
"Master Front Playback Volume",
HDA_COMPOSE_AMP_VAL(0x17, 3, 0,
HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
HDA_INPUT));
if (err < 0)
return err;
err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
"Master Front Playback Switch",
HDA_COMPOSE_AMP_VAL(0x17, 3, 0,
HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
HDA_INPUT));
if (err < 0)
return err;
Expand Down

0 comments on commit 93e2142

Please sign in to comment.