aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_realtek.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-03 11:47:49 -0500
committerTakashi Iwai <tiwai@suse.de>2008-11-03 11:50:48 -0500
commit4ef0ef1966dae9e9e29762e4e719af3cfd146ca0 (patch)
tree0201406e13875a2f19c908b2d521e2935767ec15 /sound/pci/hda/patch_realtek.c
parent26f5df265f06b8c8fe9f5d0942b7d8df00e5edec (diff)
ALSA: hda - Fix missing ADC list in ALC260 auto-probe mode
The commit f9e336f65b666b8f1764d17e9b7c21c90748a37e ALSA: hda - Unify capture mixer creation in realtek codes removed the ADC check for ALC260 auto-probe mode accidentally. Re-added to patch_alc260() again. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r--sound/pci/hda/patch_realtek.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 700fc8632c66..e727e48a48e3 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5618,6 +5618,19 @@ static int patch_alc260(struct hda_codec *codec)
5618 spec->stream_digital_playback = &alc260_pcm_digital_playback; 5618 spec->stream_digital_playback = &alc260_pcm_digital_playback;
5619 spec->stream_digital_capture = &alc260_pcm_digital_capture; 5619 spec->stream_digital_capture = &alc260_pcm_digital_capture;
5620 5620
5621 if (!spec->adc_nids && spec->input_mux) {
5622 /* check whether NID 0x04 is valid */
5623 unsigned int wcap = get_wcaps(codec, 0x04);
5624 wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
5625 /* get type */
5626 if (wcap != AC_WID_AUD_IN || spec->input_mux->num_items == 1) {
5627 spec->adc_nids = alc260_adc_nids_alt;
5628 spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt);
5629 } else {
5630 spec->adc_nids = alc260_adc_nids;
5631 spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids);
5632 }
5633 }
5621 set_capture_mixer(spec); 5634 set_capture_mixer(spec);
5622 5635
5623 spec->vmaster_nid = 0x08; 5636 spec->vmaster_nid = 0x08;