Merge branch 'for-linus' into for-next

[linux-2.6-microblaze.git] / sound / usb / quirks.c

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index d8a765b..c0e3bc4 100644 (file)
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1807,20 +1807,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;
        }
 }