[3.16.y-ckt stable] Patch "ALSA: usb-audio: correct the value cache check." has been added to staging queue
Luis Henriques
luis.henriques at canonical.com
Mon Sep 28 17:21:23 UTC 2015
This is a note to let you know that I have just added a patch titled
ALSA: usb-audio: correct the value cache check.
to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree
which can be found at:
http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue
This patch is scheduled to be released in version 3.16.7-ckt18.
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Luis
------
>From 2c07904fce472753a28cc16d90b1163637b6b38e Mon Sep 17 00:00:00 2001
From: Yao-Wen Mao <yaowen at google.com>
Date: Fri, 28 Aug 2015 16:33:25 +0800
Subject: ALSA: usb-audio: correct the value cache check.
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>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques 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 f6d4967a652a..1550e15e9179 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -2529,7 +2529,7 @@ static int restore_mixer_value(struct usb_mixer_elem_info *cval)
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 = set_cur_mix_value(cval, c + 1, idx,
cval->cache_val[idx]);
if (err < 0)
More information about the kernel-team
mailing list