ALSA: usb-audio: Remove async workaround for Scarlett 2nd gen
authorAlexander Tsoy <alexander@tsoy.me>
Fri, 24 Apr 2020 02:24:49 +0000 (05:24 +0300)
committerTakashi Iwai <tiwai@suse.de>
Fri, 24 Apr 2020 06:25:32 +0000 (08:25 +0200)
Frame size computation has been fixed and the workaround is no longer
needed.

Signed-off-by: Alexander Tsoy <alexander@tsoy.me>
Link: https://lore.kernel.org/r/20200424022449.14972-2-alexander@tsoy.me
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/quirks.c

index 351ba21..a8ece17 100644 (file)
@@ -1806,20 +1806,6 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip,
                 */
                fp->attributes &= ~UAC_EP_CS_ATTR_FILL_MAX;
                break;
-       case USB_ID(0x1235, 0x8200):  /* Focusrite Scarlett 2i4 2nd gen */
-       case USB_ID(0x1235, 0x8202):  /* Focusrite Scarlett 2i2 2nd gen */
-       case USB_ID(0x1235, 0x8205):  /* Focusrite Scarlett Solo 2nd gen */
-               /*
-                * Reports that playback should use Synch: Synchronous
-                * while still providing a feedback endpoint.
-                * Synchronous causes snapping on some sample rates.
-                * Force it to use Synch: Asynchronous.
-                */
-               if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                       fp->ep_attr &= ~USB_ENDPOINT_SYNCTYPE;
-                       fp->ep_attr |= USB_ENDPOINT_SYNC_ASYNC;
-               }
-               break;
        }
 }