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

[mv-sheeva.git] / sound / usb / usbaudio.c

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 3a53c79f48b8711d5fef7fd36be4d9550a2fb137..8db0374e10d5e23bd47ed08b4c1b6cb0afd60737 100644 (file)
--- 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) {