From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from youngberry.canonical.com ([91.189.89.112]:46407 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932583AbbI3Jwd (ORCPT ); Wed, 30 Sep 2015 05:52:33 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Yao-Wen Mao , Takashi Iwai , Luis Henriques Subject: [PATCH 3.16.y-ckt 062/133] ALSA: usb-audio: correct the value cache check. Date: Wed, 30 Sep 2015 10:50:10 +0100 Message-Id: <1443606681-7124-63-git-send-email-luis.henriques@canonical.com> In-Reply-To: <1443606681-7124-1-git-send-email-luis.henriques@canonical.com> References: <1443606681-7124-1-git-send-email-luis.henriques@canonical.com> Sender: stable-owner@vger.kernel.org List-ID: 3.16.7-ckt18 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Yao-Wen Mao commit 6aa6925cad06159dc6e25857991bbc4960821242 upstream. The check of cval->cached should be zero-based (including master channel). Signed-off-by: Yao-Wen Mao Signed-off-by: Takashi Iwai [ luis: backported to 3.16: adjusted context ] Signed-off-by: Luis Henriques --- 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)