From 66e0518e15cfffeba7909277a06f172f1c14c985 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 13 Feb 2012 15:04:06 +0100 Subject: [PATCH] --- yaml --- r: 287609 b: refs/heads/master c: fc1156c0b0f7ad45ec03d919866349eeca2bf18c h: refs/heads/master i: 287607: 2756a8d0a5b4b8f2b0b567dd53e6be91691db447 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_via.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c27301089f82..640dd8887abc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1e0c3cf7fb07227fe1f26161d969101dba78287 +refs/heads/master: fc1156c0b0f7ad45ec03d919866349eeca2bf18c diff --git a/trunk/sound/pci/hda/patch_via.c b/trunk/sound/pci/hda/patch_via.c index 284e311040fe..dff9a00ee8fb 100644 --- a/trunk/sound/pci/hda/patch_via.c +++ b/trunk/sound/pci/hda/patch_via.c @@ -666,6 +666,9 @@ static void via_auto_init_analog_input(struct hda_codec *codec) /* init input-src */ for (i = 0; i < spec->num_adc_nids; i++) { int adc_idx = spec->inputs[spec->cur_mux[i]].adc_idx; + /* secondary ADCs must have the unique MUX */ + if (i > 0 && !spec->mux_nids[i]) + break; if (spec->mux_nids[adc_idx]) { int mux_idx = spec->inputs[spec->cur_mux[i]].mux_idx; snd_hda_codec_write(codec, spec->mux_nids[adc_idx], 0,