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

[pandora-kernel.git] / sound / usb / usbaudio.c

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 3a53c79..8db0374 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;
        } 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) {
 
        /* decide how many packets to be used */
        if (is_playback) {