From: Takashi Iwai Subject: Re: [PATCH] ALSA: usb-audio: correct the value cache check. Date: Fri, 28 Aug 2015 10:47:22 +0200 Message-ID: References: <1440750805-147304-1-git-send-email-yaowen@google.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 1470D2602F1 for ; Fri, 28 Aug 2015 10:47:23 +0200 (CEST) In-Reply-To: <1440750805-147304-1-git-send-email-yaowen@google.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Yao-Wen Mao Cc: alsa-devel@alsa-project.org, dgreid@chromium.org List-Id: alsa-devel@alsa-project.org On Fri, 28 Aug 2015 10:33:25 +0200, Yao-Wen Mao wrote: > > The check of cval->cached should be zero-based (including master channel). > > Signed-off-by: Yao-Wen Mao A good catch. Applied now, thanks. Takashi > --- > 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 fd5c49e..f494dce 100644 > --- a/sound/usb/mixer.c > +++ b/sound/usb/mixer.c > @@ -2540,7 +2540,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) > -- > 2.5.0.457.gab17608 > >