diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:33:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:33:07 +0200 |
| commit | fd30afa454282bbe1b36d5d77bd72c0ea5b3f97c (patch) | |
| tree | 37557d4c96d89641eef362995322547b91b24669 /sound/usb/usbaudio.c | |
| parent | b34c8663940dfc7da767c42b37605e5ad3ae11f7 (diff) | |
| parent | f1e6d3c5cf86675e54a17a89668aa6685d2ef59d (diff) | |
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
Diffstat (limited to 'sound/usb/usbaudio.c')
| -rw-r--r-- | sound/usb/usbaudio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 3a53c79f48b..8db0374e10d 100644 --- 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) { |