From 5233e2ebb4855a76daaabd79adf161ff8255c103 Mon Sep 17 00:00:00 2001 From: Jonathan Woithe Date: Tue, 28 Feb 2006 11:38:35 +0100 Subject: [PATCH] --- yaml --- r: 22745 b: refs/heads/master c: d57fdac0691d500d5c697e452f769335b22a75e3 h: refs/heads/master i: 22743: 2ca05309d159170a86161918ea4882a1da7427b2 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_realtek.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 764774aab811..26e363a234b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdcd9268a1b03c6695ea07983ce029b2b4a099d8 +refs/heads/master: d57fdac0691d500d5c697e452f769335b22a75e3 diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c index 600d0a037842..80ba6c753c33 100644 --- a/trunk/sound/pci/hda/patch_realtek.c +++ b/trunk/sound/pci/hda/patch_realtek.c @@ -2419,7 +2419,10 @@ static hda_nid_t alc260_hp_adc_nids[2] = { 0x05, 0x04 }; -static hda_nid_t alc260_fujitsu_adc_nids[2] = { +/* NIDs used when simultaneous access to both ADCs makes sense. Note that + * alc260_capture_mixer assumes ADC0 (nid 0x04) is the first ADC. + */ +static hda_nid_t alc260_dual_adc_nids[2] = { /* ADC0, ADC1 */ 0x04, 0x05 }; @@ -3285,8 +3288,8 @@ static struct alc_config_preset alc260_presets[] = { .init_verbs = { alc260_fujitsu_init_verbs }, .num_dacs = ARRAY_SIZE(alc260_dac_nids), .dac_nids = alc260_dac_nids, - .num_adc_nids = ARRAY_SIZE(alc260_fujitsu_adc_nids), - .adc_nids = alc260_fujitsu_adc_nids, + .num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids), + .adc_nids = alc260_dual_adc_nids, .num_channel_mode = ARRAY_SIZE(alc260_modes), .channel_mode = alc260_modes, .input_mux = &alc260_fujitsu_capture_source,