[ALSA] usbaudio - Revert the minimal period size fix patch

[firefly-linux-kernel-4.4.55.git] / sound / usb / usbaudio.c

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 78efcffce8d1ed5ae929b8b2efb5d6430c65f090..8ebc1adb5ed9818ddb9c6d8cfef453ca418110cd 100644 (file)
--- 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)) {