[PATCH 4.1 028/159] ALSA: usb-audio: correct the value cache check.
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2015-09-26 21:11:19
Also in:
lkml
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2015-09-26 21:11:19
Also in:
lkml
4.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yao-Wen Mao <redacted> commit 6aa6925cad06159dc6e25857991bbc4960821242 upstream. The check of cval->cached should be zero-based (including master channel). Signed-off-by: Yao-Wen Mao <redacted> Signed-off-by: Takashi Iwai <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- sound/usb/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c@@ -2522,7 +2522,7 @@ static int restore_mixer_value(struct us for (c = 0; c < MAX_CHANNELS; c++) { if (!(cval->cmask & (1 << c))) continue; - if (cval->cached & (1 << c)) { + if (cval->cached & (1 << (c + 1))) { err = snd_usb_set_cur_mix_value(cval, c + 1, idx, cval->cache_val[idx]); if (err < 0)