Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: hda/realtek - Make path->idx[] and path->multi[] consistent

Browse source 
So far, idx[i] and multi[i] indicate the attribute of the widget
path[i - 1].  This was just for simplifying the code in
__parse_output_path(), but this is rather confusing for later use.
It's more natural if both idx[i] and multi[i] point to the same widget
of path[i].  This patch changes to that way.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-12-10 17:27:57 +01:00
parent 78e635c93b
commit 95e960cece
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sound/pci/hda/patch_realtek.c
View file

@ -102,8 +102,8 @@ enum {
#define MAX_NID_PATH_DEPTH 5 #define MAX_NID_PATH_DEPTH 5
/* output-path: DAC -> ... -> pin /* output-path: DAC -> ... -> pin
* idx[] contains the source index number of the next widget; * idx[i] contains the source index number to select on of the widget path[i];
* e.g. idx[0] is the index of the DAC selected by path[1] widget * 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 * multi[] indicates whether it's a selector widget with multi-connectors
* (i.e. the connection selection is mandatory) * (i.e. the connection selection is mandatory)
* vol_ctl and mute_ctl contains the NIDs for the assigned mixers * vol_ctl and mute_ctl contains the NIDs for the assigned mixers
@ -2937,9 +2937,9 @@ static bool __parse_output_path(struct hda_codec *codec, hda_nid_t nid,
found: found:
path->path[path->depth] = conn[i]; 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) 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++; path->depth++;
return true; return true;
} }
@ -3846,10 +3846,10 @@ static void alc_auto_set_output_and_unmute(struct hda_codec *codec,
for (i = path->depth - 1; i >= 0; i--) { for (i = path->depth - 1; i >= 0; i--) {
hda_nid_t nid = path->path[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, snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_CONNECT_SEL, AC_VERB_SET_CONNECT_SEL,
path->idx[i - 1]); path->idx[i]);
if (i != 0 && i != path->depth - 1 && if (i != 0 && i != path->depth - 1 &&
(get_wcaps(codec, nid) & AC_WCAP_IN_AMP) && (get_wcaps(codec, nid) & AC_WCAP_IN_AMP) &&