Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353017
b: refs/heads/master
c: 0250f7c
h: refs/heads/master
i:
  353015: ddf3355
v: v3
  • Loading branch information
Takashi Iwai committed Jan 12, 2013
1 parent bafaaab commit 7bc365b
Show file tree
Hide file tree
Showing 2 changed files with 10 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: 6518f7ac5183ca77805f10323ea716fe86fd7c89
refs/heads/master: 0250f7cbea95c90564253cae8de80f0caad81fc0
12 changes: 9 additions & 3 deletions trunk/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 7bc365b

Please sign in to comment.