diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2012-02-16 16:43:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-02-16 16:43:09 +0100 |
| commit | 00bc0ce9130551ef193c3f5db0b7b6e70dff28ac (patch) | |
| tree | b6b022250a08073e522ed1bba56586b534a3c77e /sound/pci/hda/patch_via.c | |
| parent | ALSA: hda/realtek - Disable static fixups for ASUS with ALC269 (diff) | |
| parent | ALSA: hda/realtek - Fix overflow of vol/sw check bitmap (diff) | |
| download | linux-dev-00bc0ce9130551ef193c3f5db0b7b6e70dff28ac.tar.xz linux-dev-00bc0ce9130551ef193c3f5db0b7b6e70dff28ac.zip | |
Merge branch 'fix/hda' into topic/hda
The fix for bitmap-overflow in Realtek codec driver is needed for the
further development of the auto-parser with badness evaluation.
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 e5842fe1b1e8..c7eb4d7d05c0 100644 --- a/sound/pci/hda/patch_via.c +++ b/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, |