changelog shortlog tags manifest raw

changeset: hda-codec - Don't create multiple capture streams for single inputs

changeset 5879: 6b53fa114faa
parent 5878:d330074658fb
child 5880:dde8ff96c3bf
author: tiwai
date: Tue Feb 19 15:03:57 2008 +0100 (16 months ago)
files: pci/hda/patch_realtek.c
description: hda-codec - Don't create multiple capture streams for single inputs

When the device has only one input source, it makes no sense to have
multiple capture streams.		 
--- a/pci/hda/patch_realtek.c	Tue Feb 19 15:00:15 2008 +0100
+++ b/pci/hda/patch_realtek.c	Tue Feb 19 15:03:57 2008 +0100
@@ -4950,7 +4950,7 @@ static int alc260_parse_auto_config(stru
 	/* check whether NID 0x04 is valid */
 	wcap = get_wcaps(codec, 0x04);
 	wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
-	if (wcap != AC_WID_AUD_IN) {
+	if (wcap != AC_WID_AUD_IN || spec->input_mux->num_items == 1) {
 		spec->adc_nids = alc260_adc_nids_alt;
 		spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt);
 		spec->mixers[spec->num_mixers] = alc260_capture_alt_mixer;
@@ -10275,7 +10275,7 @@ static int patch_alc268(struct hda_codec
 
 		/* get type */
 		wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
-		if (wcap != AC_WID_AUD_IN) {
+		if (wcap != AC_WID_AUD_IN || spec->input_mux->num_items == 1) {
 			spec->adc_nids = alc268_adc_nids_alt;
 			spec->num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt);
 			spec->mixers[spec->num_mixers] =