summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai2012-02-25 11:13:16 +0100
committerTakashi Iwai2012-02-25 11:13:16 +0100
commit068b939431486f524438330b0848a8222e33d421 (patch)
tree212c1aa8c999e3f9837cbda215f97122bd08c59a
parentALSA: snd-usb-caiaq: Fix the return of XRUN (diff)
downloadkernel-qcow2-linux-068b939431486f524438330b0848a8222e33d421.tar.gz
kernel-qcow2-linux-068b939431486f524438330b0848a8222e33d421.tar.xz
kernel-qcow2-linux-068b939431486f524438330b0848a8222e33d421.zip
ALSA: hda/realtek - Fix resume of multiple input sources
When there are multiple input sources, the driver wrongly overwrites with the value of the last input source on other slots at resume. Thus the primary input source may be shown wrongly. Reported-and-tested-by: Julian Sikorski <belegdol@gmail.com> Cc: <stable@kernel.org> [v3.1+] Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_realtek.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 3647baa9bfed..4fe2d5960a04 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3797,7 +3797,7 @@ static void alc_auto_init_input_src(struct hda_codec *codec)
else
nums = spec->num_adc_nids;
for (c = 0; c < nums; c++)
- alc_mux_select(codec, 0, spec->cur_mux[c], true);
+ alc_mux_select(codec, c, spec->cur_mux[c], true);
}
/* add mic boosts if needed */