[PATCH 3.19.y-ckt 078/156] ALSA: usb-audio: correct the value cache check.
Kamal Mostafa
kamal at canonical.com
Tue Oct 20 21:36:59 UTC 2015
3.19.8-ckt8 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Yao-Wen Mao <yaowen at google.com>
commit 6aa6925cad06159dc6e25857991bbc4960821242 upstream.
The check of cval->cached should be zero-based (including master channel).
Signed-off-by: Yao-Wen Mao <yaowen at google.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
sound/usb/mixer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 8b7e391..cd8ed2e 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -2522,7 +2522,7 @@ static int restore_mixer_value(struct usb_mixer_elem_list *list)
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)
--
1.9.1
More information about the kernel-team
mailing list