summaryrefslogtreecommitdiffstats
path: root/sound/usb/usbaudio.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2007-05-03 12:26:14 +0200
committerJaroslav Kysela <perex@suse.cz>2007-05-11 16:56:14 +0200
commit81c4899f7ef3675fdc574de2671ff9fa45996cc5 (patch)
treeeaf295ec2f7a964588737d9c3deeefc1084bc943 /sound/usb/usbaudio.c
parent4d69d756d19a4f457749f3667ad7fc8984bba15c (diff)
downloadtalos-obmc-linux-81c4899f7ef3675fdc574de2671ff9fa45996cc5.tar.gz
talos-obmc-linux-81c4899f7ef3675fdc574de2671ff9fa45996cc5.zip
[ALSA] usbaudio - Revert the minimal period size fix patch
The last patch didn't really work (false report). Although the hardware supports 125us minimum period, the current usb-audio driver code assumes the 1ms period in many places. Rollback the change. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/usb/usbaudio.c')
-rw-r--r--sound/usb/usbaudio.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 78efcffce8d1..8ebc1adb5ed9 100644
--- a/sound/usb/usbaudio.c
+++ b/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)) {
OpenPOWER on IntegriCloud