Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353003
b: refs/heads/master
c: 95e960c
h: refs/heads/master
i:
  353001: 104edd0
  352999: 4330721
v: v3
  • Loading branch information
Takashi Iwai committed Jan 10, 2013
1 parent 1ba8cc1 commit 5859d75
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: 78e635c93b0e385dc23d18c2a4047fc8857467bd
refs/heads/master: 95e960cece76cb538fcac03ac80893db0f1e6a15
12 changes: 6 additions & 6 deletions trunk/sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ enum {
#define MAX_NID_PATH_DEPTH 5

/* output-path: DAC -> ... -> pin
* idx[] contains the source index number of the next widget;
* e.g. idx[0] is the index of the DAC selected by path[1] widget
* idx[i] contains the source index number to select on of the widget path[i];
* e.g. idx[1] is the index of the DAC (path[0]) selected by path[1] widget
* multi[] indicates whether it's a selector widget with multi-connectors
* (i.e. the connection selection is mandatory)
* vol_ctl and mute_ctl contains the NIDs for the assigned mixers
Expand Down Expand Up @@ -2937,9 +2937,9 @@ static bool __parse_output_path(struct hda_codec *codec, hda_nid_t nid,

found:
path->path[path->depth] = conn[i];
path->idx[path->depth] = i;
path->idx[path->depth + 1] = i;
if (nums > 1 && get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_AUD_MIX)
path->multi[path->depth] = 1;
path->multi[path->depth + 1] = 1;
path->depth++;
return true;
}
Expand Down Expand Up @@ -3846,10 +3846,10 @@ static void alc_auto_set_output_and_unmute(struct hda_codec *codec,

for (i = path->depth - 1; i >= 0; i--) {
hda_nid_t nid = path->path[i];
if (i > 0 && path->multi[i - 1])
if (path->multi[i])
snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_CONNECT_SEL,
path->idx[i - 1]);
path->idx[i]);

if (i != 0 && i != path->depth - 1 &&
(get_wcaps(codec, nid) & AC_WCAP_IN_AMP) &&
Expand Down

0 comments on commit 5859d75

Please sign in to comment.