Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 174277
b: refs/heads/master
c: d11f74c
h: refs/heads/master
i:
  174275: 68200d6
v: v3
  • Loading branch information
Takashi Iwai committed Dec 8, 2009
1 parent 47c4827 commit 16ecb37
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 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: 23033b2bce4361f2859ee0331f97c9056dae7091
refs/heads/master: d11f74c62fb4a1fefd39085570fb6dfa7b9ab2bb
13 changes: 12 additions & 1 deletion trunk/sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -10021,10 +10021,12 @@ static int patch_alc882(struct hda_codec *codec)
spec->init_amp = ALC_INIT_DEFAULT; /* always initialize */

if (!spec->adc_nids && spec->input_mux) {
int i;
int i, j;
spec->num_adc_nids = 0;
for (i = 0; i < ARRAY_SIZE(alc882_adc_nids); i++) {
const struct hda_input_mux *imux = spec->input_mux;
hda_nid_t cap;
hda_nid_t items[16];
hda_nid_t nid = alc882_adc_nids[i];
unsigned int wcap = get_wcaps(codec, nid);
/* get type */
Expand All @@ -10035,6 +10037,15 @@ static int patch_alc882(struct hda_codec *codec)
err = snd_hda_get_connections(codec, nid, &cap, 1);
if (err < 0)
continue;
err = snd_hda_get_connections(codec, cap, items,
ARRAY_SIZE(items));
if (err < 0)
continue;
for (j = 0; j < imux->num_items; j++)
if (imux->items[j].index >= err)
break;
if (j < imux->num_items)
continue;
spec->private_capsrc_nids[spec->num_adc_nids] = cap;
spec->num_adc_nids++;
}
Expand Down

0 comments on commit 16ecb37

Please sign in to comment.