Merge branch 'topic/usb-audio' into for-linus

* topic/usb-audio: ALSA: usb-audio - Fix types taken in min() sound: usb-audio: do not make URBs longer than sync packet interval sound: usb-audio: add MIDI drain callback sound: usb-audio: use multiple output URBs sound: usb-audio: use multiple input URBs sound: usb-audio: Xonar U1 digital output support
git-mirror · Sep 10, 2009 · fd30afa · fd30afa
2 parents b34c866 + f1e6d3c
commit fd30afa
Show file tree

Hide file tree

Showing 3 changed files with 256 additions and 96 deletions.
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
@@ -1083,6 +1083,8 @@ static int init_substream_urbs(struct snd_usb_substream *subs, unsigned int peri
 	} else
 		urb_packs = 1;
 	urb_packs *= packs_per_ms;
+	if (subs->syncpipe)
+		urb_packs = min(urb_packs, 1U << subs->syncinterval);
 
 	/* decide how many packets to be used */
 	if (is_playback) {