summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2009-03-02 12:06:28 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-02 14:50:01 +0100
commitb1c86bb807448701400abc6eb8e958475ab5424b (patch)
tree7673a17d82c20f5bc1824c17bc2cb1a0c05004ea /sound
parentsound: usb-audio: fix rules check for 32-channel devices (diff)
downloadlinux-b1c86bb807448701400abc6eb8e958475ab5424b.tar.xz
linux-b1c86bb807448701400abc6eb8e958475ab5424b.zip
sound: usb-audio: fix queue length check for high speed devices
When checking for the maximum queue length, we have to take into account that MAX_QUEUE is measured in milliseconds (i.e., frames) while the unit of urb_packs is whatever data packet interval the device uses (possibly less than one frame when using high speed devices). Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/usbaudio.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index f853b627cf43..defe9913cbb2 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -1095,9 +1095,8 @@ static int init_substream_urbs(struct snd_usb_substream *subs, unsigned int peri
total_packs = 2 * packs_per_ms;
} else {
/* and we don't want too long a queue either */
- maxpacks = max((unsigned int)MAX_QUEUE, urb_packs * 2);
- if (total_packs > maxpacks * packs_per_ms)
- total_packs = maxpacks * packs_per_ms;
+ maxpacks = max(MAX_QUEUE * packs_per_ms, urb_packs * 2);
+ total_packs = min(total_packs, maxpacks);
}
} else {
total_packs = MAX_URBS * urb_packs;