diff options
author | Clark Williams <williams@redhat.com> | 2012-02-23 21:33:05 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-02-23 21:33:05 -0600 |
commit | a0c034c3726715d1928b301ddd43c51799c0c07a (patch) | |
tree | 76e78b4646ca0560d8cd0ee041a8bde9a5269c8c /sound/pci/hda/patch_via.c | |
parent | 086290148fc37d7f2eccb7026b18fb9539ec7820 (diff) | |
parent | 9d0231c207faeda051cf54c1a64e1a147d2187fa (diff) |
Merge commit 'v3.2.7' into rt-3.2.7-rt13v3.2.7-rt13
Diffstat (limited to 'sound/pci/hda/patch_via.c')
-rw-r--r-- | sound/pci/hda/patch_via.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index a0a3f5002b4f..1fe13089a933 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -665,6 +665,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, |