From 26ea07d48898176a6e3d006f7def22776387b5cf Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 3 May 2007 12:26:14 +0200 Subject: [PATCH] --- yaml --- r: 56199 b: refs/heads/master c: 81c4899f7ef3675fdc574de2671ff9fa45996cc5 h: refs/heads/master i: 56197: 3afefbb55f11a1804bdc7cde43ce4ae6e75172f6 56195: 567cedfa6c93e076bdc8d31c487d0d8120f3bc24 56191: 94a04c7741bef8a6ee758f9407a53f904fcbea23 v: v3 --- [refs] | 2 +- trunk/sound/usb/usbaudio.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 966ae000a576..e8c21b215a36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d69d756d19a4f457749f3667ad7fc8984bba15c +refs/heads/master: 81c4899f7ef3675fdc574de2671ff9fa45996cc5 diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c index 78efcffce8d1..8ebc1adb5ed9 100644 --- a/trunk/sound/usb/usbaudio.c +++ b/trunk/sound/usb/usbaudio.c @@ -1878,10 +1878,11 @@ 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, - snd_usb_get_speed(subs->dev) == USB_SPEED_FULL ? - - 1000 * MIN_PACKS_URB : 125 * MIN_PACKS_URB, + 1000 * MIN_PACKS_URB, /*(nrpacks * MAX_URBS) * 1000*/ UINT_MAX); if (check_hw_params_convention(subs)) {