---

yaml --- r: 56199 b: refs/heads/master c: 81c4899 h: refs/heads/master i: 56197: 3afefbb 56195: 567cedf 56191: 94a04c7 v: v3
git-mirror · May 11, 2007 · 26ea07d · 26ea07d
1 parent 5ff7b55
commit 26ea07d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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)) {