diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2009-03-02 12:06:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-02 14:50:01 +0100 |
| commit | b1c86bb807448701400abc6eb8e958475ab5424b (patch) | |
| tree | 7673a17d82c20f5bc1824c17bc2cb1a0c05004ea /sound/usb | |
| parent | eab2b553c3d3ed20698c4a9c7e049a60b804e2f5 (diff) | |
| download | linux-3.10-b1c86bb807448701400abc6eb8e958475ab5424b.tar.gz linux-3.10-b1c86bb807448701400abc6eb8e958475ab5424b.tar.bz2 linux-3.10-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/usb')
| -rw-r--r-- | sound/usb/usbaudio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index f853b627cf4..defe9913cbb 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; |