X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=sound%2Fusb%2Fusbaudio.c;h=8ebc1adb5ed9818ddb9c6d8cfef453ca418110cd;hb=fdb64f93b38a3470fa4db8cd5720b8c731922d1a;hp=4dfb91d4398a02fb6962ba07310f658d7cc30fe9;hpb=a727fea99bf4b2addcd64c596735148117a7b37f;p=linux-2.6-omap-h63xx.git diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 4dfb91d4398..8ebc1adb5ed 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -325,16 +325,6 @@ static int prepare_capture_urb(struct snd_usb_substream *subs, } urb->transfer_buffer_length = offs; urb->number_of_packets = ctx->packets; -#if 0 // for check - if (! urb->bandwidth) { - int bustime; - bustime = usb_check_bandwidth(urb->dev, urb); - if (bustime < 0) - return bustime; - printk("urb %d: bandwidth = %d (packets = %d)\n", ctx->index, bustime, urb->number_of_packets); - usb_claim_bandwidth(urb->dev, urb, bustime, 1); - } -#endif // for check return 0; } @@ -1888,6 +1878,9 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substre } /* set the period time minimum 1ms */ + /* FIXME: high-speed mode allows 125us minimum period, but many parts + * in the current code assume the 1ms period. + */ snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_TIME, 1000 * MIN_PACKS_URB, /*(nrpacks * MAX_URBS) * 1000*/ UINT_MAX);