From 5a9f0bfd978cc5aa504c1ff7ad3a79da73b71404 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 3 Nov 2011 15:56:55 +0100 Subject: ALSA: hda - Add missing static ADC tables for ALC269 quirks [There is no upstream commit for this patch since the corresponding code was removed from 3.2 kernel. This is a regression found only in 3.1 kernel, so please apply this only to 3.1.x series.] Some ALC269 quirks define their own .cap_mixer field but without the static adc_nids[]. This resulted in the mismatch of ADC because ALC269 may have the widget 0x07 for another audio-in, and the auto-parser picks this up instead. This patch fixes the problem by adding the static adc_nids[] and co again to these entries. Tested-by: Chris Vine Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/alc269_quirks.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'sound') diff --git a/sound/pci/hda/alc269_quirks.c b/sound/pci/hda/alc269_quirks.c index 5ac0e2162a46..9aeeb3264603 100644 --- a/sound/pci/hda/alc269_quirks.c +++ b/sound/pci/hda/alc269_quirks.c @@ -577,6 +577,9 @@ static const struct alc_config_preset alc269_presets[] = { alc269_laptop_amic_init_verbs }, .num_dacs = ARRAY_SIZE(alc269_dac_nids), .dac_nids = alc269_dac_nids, + .adc_nids = alc269_adc_nids, + .capsrc_nids = alc269_capsrc_nids, + .num_adc_nids = ARRAY_SIZE(alc269_adc_nids), .hp_nid = 0x03, .num_channel_mode = ARRAY_SIZE(alc269_modes), .channel_mode = alc269_modes, @@ -591,6 +594,9 @@ static const struct alc_config_preset alc269_presets[] = { alc269_laptop_dmic_init_verbs }, .num_dacs = ARRAY_SIZE(alc269_dac_nids), .dac_nids = alc269_dac_nids, + .adc_nids = alc269_adc_nids, + .capsrc_nids = alc269_capsrc_nids, + .num_adc_nids = ARRAY_SIZE(alc269_adc_nids), .hp_nid = 0x03, .num_channel_mode = ARRAY_SIZE(alc269_modes), .channel_mode = alc269_modes, @@ -605,6 +611,9 @@ static const struct alc_config_preset alc269_presets[] = { alc269vb_laptop_amic_init_verbs }, .num_dacs = ARRAY_SIZE(alc269_dac_nids), .dac_nids = alc269_dac_nids, + .adc_nids = alc269vb_adc_nids, + .capsrc_nids = alc269vb_capsrc_nids, + .num_adc_nids = ARRAY_SIZE(alc269vb_adc_nids), .hp_nid = 0x03, .num_channel_mode = ARRAY_SIZE(alc269_modes), .channel_mode = alc269_modes, @@ -619,6 +628,9 @@ static const struct alc_config_preset alc269_presets[] = { alc269vb_laptop_dmic_init_verbs }, .num_dacs = ARRAY_SIZE(alc269_dac_nids), .dac_nids = alc269_dac_nids, + .adc_nids = alc269vb_adc_nids, + .capsrc_nids = alc269vb_capsrc_nids, + .num_adc_nids = ARRAY_SIZE(alc269vb_adc_nids), .hp_nid = 0x03, .num_channel_mode = ARRAY_SIZE(alc269_modes), .channel_mode = alc269_modes, @@ -633,6 +645,8 @@ static const struct alc_config_preset alc269_presets[] = { alc269_laptop_dmic_init_verbs }, .num_dacs = ARRAY_SIZE(alc269_dac_nids), .dac_nids = alc269_dac_nids, + .adc_nids = alc269_adc_nids, + .capsrc_nids = alc269_capsrc_nids, .hp_nid = 0x03, .num_channel_mode = ARRAY_SIZE(alc269_modes), .channel_mode = alc269_modes, -- cgit v1.2.3