Skip to content

Commit

Permalink
ALSA: hda/realtek - Fix the initialization of pin amp-in
Browse files Browse the repository at this point in the history
The pin widget has only a single amp value for the input even if it
has multiple "sources".  Handle the situation in activate_path().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Jan 12, 2013
1 parent 6518f7a commit 0250f7c
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -3921,21 +3921,27 @@ static void activate_amp_in(struct hda_codec *codec, struct nid_path *path,
{
struct alc_spec *spec = codec->spec;
hda_nid_t conn[16];
int n, nums;
int n, nums, idx;
hda_nid_t nid = path->path[i];

nums = snd_hda_get_connections(codec, nid, conn, ARRAY_SIZE(conn));
if (get_wcaps_type(get_wcaps(codec, nid)) == AC_WID_PIN) {
nums = 1;
idx = 0;
} else
idx = path->idx[i];

for (n = 0; n < nums; n++)
init_amp(codec, nid, HDA_INPUT, n);

if (is_ctl_associated(codec, nid, HDA_INPUT, path->idx[i]))
if (is_ctl_associated(codec, nid, HDA_INPUT, idx))
return;

/* here is a little bit tricky in comparison with activate_amp_out();
* when aa-mixer is available, we need to enable the path as well
*/
for (n = 0; n < nums; n++) {
if (n != path->idx[i] && conn[n] != spec->mixer_nid)
if (n != idx && conn[n] != spec->mixer_nid)
continue;
activate_amp(codec, nid, HDA_INPUT, n, enable);
}
Expand Down

0 comments on commit 0250f7c

Please sign in to comment.