Commit 04c96460 authored by Alexander Tsoy's avatar Alexander Tsoy Committed by Takashi Iwai
Browse files

ALSA: usb-audio: Remove async workaround for Scarlett 2nd gen 



Frame size computation has been fixed and the workaround is no longer
needed.

Signed-off-by: default avatarAlexander Tsoy <alexander@tsoy.me>
Link: https://lore.kernel.org/r/20200424022449.14972-2-alexander@tsoy.me


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f0bd62b6

sound/usb/quirks.c

+0 −14
Original line number Diff line number Diff line
@@ -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;

	}

}