aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-02-19 09:03:57 -0500
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:13 -0400
commit67ebcb0311110dc7268bb5b135bf437d8033337e (patch)
treeaa1077b7d255d2095777c8ad429e793870830ec1
parent85860c06aba5e145805ad840553a2388e60a7e23 (diff)
[ALSA] 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. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_realtek.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 630c7b22542a..2100ee480809 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4950,7 +4950,7 @@ static int alc260_parse_auto_config(struct hda_codec *codec)
4950 /* check whether NID 0x04 is valid */ 4950 /* check whether NID 0x04 is valid */
4951 wcap = get_wcaps(codec, 0x04); 4951 wcap = get_wcaps(codec, 0x04);
4952 wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */ 4952 wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
4953 if (wcap != AC_WID_AUD_IN) { 4953 if (wcap != AC_WID_AUD_IN || spec->input_mux->num_items == 1) {
4954 spec->adc_nids = alc260_adc_nids_alt; 4954 spec->adc_nids = alc260_adc_nids_alt;
4955 spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt); 4955 spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt);
4956 spec->mixers[spec->num_mixers] = alc260_capture_alt_mixer; 4956 spec->mixers[spec->num_mixers] = alc260_capture_alt_mixer;
@@ -10276,7 +10276,7 @@ static int patch_alc268(struct hda_codec *codec)
10276 10276
10277 /* get type */ 10277 /* get type */
10278 wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; 10278 wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
10279 if (wcap != AC_WID_AUD_IN) { 10279 if (wcap != AC_WID_AUD_IN || spec->input_mux->num_items == 1) {
10280 spec->adc_nids = alc268_adc_nids_alt; 10280 spec->adc_nids = alc268_adc_nids_alt;
10281 spec->num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt); 10281 spec->num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt);
10282 spec->mixers[spec->num_mixers] = 10282 spec->mixers[spec->num_mixers] =