From 7a4b2989a3701bafb6bb6e3364134e826ba9776a Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 17 Jan 2013 15:53:29 +0100
Subject: [PATCH] --- yaml --- r: 353167 b: refs/heads/master c:
 0ffd534eb164fbc87e91fc54a217247ea0cfbabc h: refs/heads/master i:   353165:
 40660c969347163dc1b6c46ac7278c84fb63b236   353163:
 c743c613ea2c1868f50c50302c191aeffb1b88fb   353159:
 9194b04cec59d89029d2b4409d764a41a40181d6   353151:
 b4862814e833df5976a95ae68eb227506c26f827 v: v3

---
 [refs]                            | 2 +-
 trunk/sound/pci/hda/hda_generic.c | 5 +++++
 trunk/sound/pci/hda/hda_generic.h | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 836372447c04..3758db19b718 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a71bbf310cda13a713aab0c1dcf888707a54286
+refs/heads/master: 0ffd534eb164fbc87e91fc54a217247ea0cfbabc
diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c
index 9c06749738b1..fc3f24113ce3 100644
--- a/trunk/sound/pci/hda/hda_generic.c
+++ b/trunk/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/trunk/sound/pci/hda/hda_generic.h b/trunk/sound/pci/hda/hda_generic.h
index 43a8482ed2b3..a0486b1b4da4 100644
--- a/trunk/sound/pci/hda/hda_generic.h
+++ b/trunk/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;