---

yaml --- r: 353186 b: refs/heads/master c: cf799aa h: refs/heads/master v: v3
git-mirror · Jan 18, 2013 · abef797 · abef797
1 parent b209575
commit abef797
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a8d53916b9cea3eac615f0bb1e7fabec3d5c026
+refs/heads/master: cf799aa300b38f86684944bf9f61f7a13277f8b2
diff --git a/trunk/sound/pci/hda/hda_generic.h b/trunk/sound/pci/hda/hda_generic.h
@@ -102,11 +102,11 @@ struct hda_gen_spec {
 
 	/* capture */
 	unsigned int num_adc_nids;
-	hda_nid_t adc_nids[AUTO_CFG_MAX_OUTS];
+	hda_nid_t adc_nids[AUTO_CFG_MAX_INS];
 	hda_nid_t dig_in_nid;		/* digital-in NID; optional */
 	hda_nid_t mixer_nid;		/* analog-mixer NID */
-	const char *input_labels[AUTO_CFG_MAX_INS];
-	int input_label_idxs[AUTO_CFG_MAX_INS];
+	const char *input_labels[HDA_MAX_NUM_INPUTS];
+	int input_label_idxs[HDA_MAX_NUM_INPUTS];
 
 	/* capture setup for dynamic dual-adc switch */
 	hda_nid_t cur_adc;
@@ -148,7 +148,7 @@ struct hda_gen_spec {
 	int num_all_dacs;
 	hda_nid_t all_dacs[16];
 	int num_all_adcs;
-	hda_nid_t all_adcs[AUTO_CFG_MAX_OUTS];
+	hda_nid_t all_adcs[AUTO_CFG_MAX_INS];
 
 	/* path list */
 	struct snd_array paths;