Merge branch 'fix/hda' into topic/hda

Conflicts: sound/pci/hda/patch_realtek.c
2009-08-31 08:27:10 +02:00
parent e9af4f365f a3f730af7e
commit be0ae923a4
2 changed files with 21 additions and 14 deletions
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -1394,6 +1394,7 @@ static int patch_vt1708(struct hda_codec *codec)
 	if (!spec->adc_nids && spec->input_mux) {
 		spec->adc_nids = vt1708_adc_nids;
 		spec->num_adc_nids = ARRAY_SIZE(vt1708_adc_nids);
+		get_mux_nids(codec);
 		spec->mixers[spec->num_mixers] = vt1708_capture_mixer;
 		spec->num_mixers++;
 	}