From 0ffd534eb164fbc87e91fc54a217247ea0cfbabc Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 17 Jan 2013 15:53:29 +0100 Subject: [PATCH] ALSA: hda - Record all detected ADCs in hda_gen_spec Since the generic parser reduces the ADC list, copy the list of the all detected ADCs and keep it. This list can be later referred by the codec driver for finer power controls. Signed-off-by: Takashi Iwai --- sound/pci/hda/hda_generic.c | 5 +++++ sound/pci/hda/hda_generic.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 9c06749738b1..fc3f24113ce3 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -2368,6 +2368,11 @@ static int fill_adc_nids(struct hda_codec *codec) break; } spec->num_adc_nids = nums; + + /* copy the detected ADCs to all_adcs[] */ + spec->num_all_adcs = nums; + memcpy(spec->all_adcs, spec->adc_nids, nums * sizeof(hda_nid_t)); + return nums; } diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 43a8482ed2b3..a0486b1b4da4 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -142,9 +142,11 @@ struct hda_gen_spec { unsigned int dyn_adc_idx[HDA_MAX_NUM_INPUTS]; hda_nid_t shared_mic_vref_pin; - /* DAC list */ + /* DAC/ADC lists */ int num_all_dacs; hda_nid_t all_dacs[16]; + int num_all_adcs; + hda_nid_t all_adcs[AUTO_CFG_MAX_OUTS]; /* path list */ struct snd_array paths; -- 2.20.1