diff options
Diffstat (limited to 'sound')
| -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 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 | |||
| 1095 | total_packs = 2 * packs_per_ms; | 1095 | total_packs = 2 * packs_per_ms; |
| 1096 | } else { | 1096 | } else { |
| 1097 | /* and we don't want too long a queue either */ | 1097 | /* and we don't want too long a queue either */ |
| 1098 | maxpacks = max((unsigned int)MAX_QUEUE, urb_packs * 2); | 1098 | maxpacks = max(MAX_QUEUE * packs_per_ms, urb_packs * 2); |
| 1099 | if (total_packs > maxpacks * packs_per_ms) | 1099 | total_packs = min(total_packs, maxpacks); |
| 1100 | total_packs = maxpacks * packs_per_ms; | ||
| 1101 | } | 1100 | } |
| 1102 | } else { | 1101 | } else { |
| 1103 | total_packs = MAX_URBS * urb_packs; | 1102 | total_packs = MAX_URBS * urb_packs; |