summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2015-01-04 19:59:29 +0100
committerTakashi Iwai <tiwai@suse.de>2015-01-05 08:56:19 +0100
commit49cdd5b641933fda6324fc901eaf856924ba6a27 (patch)
tree58b313a1df09183fd4aa86f034dc5b7dbfb2da2a /sound
parent62f64a880af2e82d1b41cb02cb43b88d30413993 (diff)
downloadop-kernel-dev-49cdd5b641933fda6324fc901eaf856924ba6a27.zip
op-kernel-dev-49cdd5b641933fda6324fc901eaf856924ba6a27.tar.gz
ALSA: snd-usb-caiaq: fix stream count check
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 <daniel@zonque.org> Cc: stable@kernel.org [v3.18+] Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/caiaq/audio.c2
1 files changed, 1 insertions, 1 deletions
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;
}
OpenPOWER on IntegriCloud