From: Takashi Iwai Date: Thu, 3 May 2007 10:26:14 +0000 (+0200) Subject: [ALSA] usbaudio - Revert the minimal period size fix patch X-Git-Tag: v2.6.22-rc1~22^2~16 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81c4899f7ef3675fdc574de2671ff9fa45996cc5;p=linux-2.6 [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 Signed-off-by: Jaroslav Kysela --- diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 78efcffce8..8ebc1adb5e 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)) {