---

yaml --- r: 257730 b: refs/heads/master c: de6c74f h: refs/heads/master v: v3
git-mirror · Jul 4, 2011 · 55a6106 · 55a6106
1 parent 9cb3b68
commit 55a6106
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b89596a160dc63043be3fda8babbca9a935af0aa
+refs/heads/master: de6c74f3e323b132caec898d224e0e3253d92eaf
diff --git a/trunk/sound/pci/hda/patch_via.c b/trunk/sound/pci/hda/patch_via.c
@@ -107,6 +107,8 @@ struct via_input {
 	const char *label;	/* input-source label */
 };
 
+#define VIA_MAX_ADCS	3
+
 struct via_spec {
 	/* codec parameterization */
 	const struct snd_kcontrol_new *mixers[6];
@@ -132,23 +134,23 @@ struct via_spec {
 	int num_active_streams;
 	int dac_mixer_idx;
 
-	struct nid_path out_path[4];
+	struct nid_path out_path[HDA_SIDE + 1];
 	struct nid_path hp_path;
 	struct nid_path hp_dep_path;
 	struct nid_path speaker_path;
 
 	/* capture */
 	unsigned int num_adc_nids;
-	hda_nid_t adc_nids[3];
-	hda_nid_t mux_nids[3];
+	hda_nid_t adc_nids[VIA_MAX_ADCS];
+	hda_nid_t mux_nids[VIA_MAX_ADCS];
 	hda_nid_t aa_mix_nid;
 	hda_nid_t dig_in_nid;
 
 	/* capture source */
 	bool dyn_adc_switch;
 	int num_inputs;
 	struct via_input inputs[AUTO_CFG_MAX_INS + 1];
-	unsigned int cur_mux[3];
+	unsigned int cur_mux[VIA_MAX_ADCS];
 
 	/* dynamic ADC switching */
 	hda_nid_t cur_adc;