From: Takashi Iwai Subject: Re: [PATCH] ALSA: snd-usb-caiaq: fix stream count check Date: Mon, 05 Jan 2015 08:57:17 +0100 Message-ID: References: <1420397969-12961-1-git-send-email-daniel@zonque.org> 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 (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id A2721260836 for ; Mon, 5 Jan 2015 08:57:18 +0100 (CET) In-Reply-To: <1420397969-12961-1-git-send-email-daniel@zonque.org> 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: Daniel Mack Cc: alsa-devel@alsa-project.org, stable@kernel.org, "[v3.18+]"@mail.zonque.de List-Id: alsa-devel@alsa-project.org At Sun, 4 Jan 2015 19:59:29 +0100, Daniel Mack wrote: > > Commit 897c329bc ("ALSA: usb: caiaq: check for cdev->n_streams > 1") > introduced a safety check to protect against bogus data provided by > devices. However, the n_streams variable is already divided by > CHANNELS_PER_STREAM, so the correct check is 'n_streams > 0'. > > Fix this to un-break support for stereo devices. > > Signed-off-by: Daniel Mack > Cc: stable@kernel.org [v3.18+] Applied, thanks. Takashi > --- > sound/usb/caiaq/audio.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c > index 2728447..327f864 100644 > --- a/sound/usb/caiaq/audio.c > +++ b/sound/usb/caiaq/audio.c > @@ -816,7 +816,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *cdev) > return -EINVAL; > } > > - if (cdev->n_streams < 2) { > + if (cdev->n_streams < 1) { > dev_err(dev, "bogus number of streams: %d\n", cdev->n_streams); > return -EINVAL; > } > -- > 2.2.0 >