diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 6d699065e..33d8b8b58 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -435,6 +435,12 @@ static int configure_endpoints(struct snd_usb_audio *chip, { int err; + if (subs->sync_endpoint) { + err = snd_usb_endpoint_configure(chip, subs->sync_endpoint); + if (err < 0) + return err; + } + if (subs->data_endpoint->need_setup) { /* stop any running stream beforehand */ if (stop_endpoints(subs, false)) @@ -445,12 +451,6 @@ static int configure_endpoints(struct snd_usb_audio *chip, snd_usb_set_format_quirk(subs, subs->cur_audiofmt); } - if (subs->sync_endpoint) { - err = snd_usb_endpoint_configure(chip, subs->sync_endpoint); - if (err < 0) - return err; - } - return 0; } diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 40a5e3eb4..2acaa543f 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -4112,5 +4112,64 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, +{ + /** + * TC-Helicon GoXLR Configuration + */ + USB_DEVICE(0x1220, 0x8fe0), + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_IGNORE_INTERFACE, + }, + { + .ifnum = 1, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat) { + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .channels = 10, + .iface = 1, + .altsetting = 1, + .altset_idx = 1, + .endpoint = 0x08, + .ep_attr = USB_ENDPOINT_XFER_ISOC | + USB_ENDPOINT_SYNC_ASYNC, + .clock = 0x28, + .rate_min = 48000, + .rate_max = 48000, + .nr_rates = 1, + .rate_table = (unsigned int[]) { 48000 } + } + }, + { + .ifnum = 2, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat) { + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .channels = 25, // inputs + .iface = 2, + .altsetting = 1, + .altset_idx = 1, + .endpoint = 0x88, + .ep_attr = USB_ENDPOINT_XFER_ISOC | + USB_ENDPOINT_SYNC_ASYNC | + USB_ENDPOINT_USAGE_IMPLICIT_FB, + .clock = 0x28, + .rate_min = 48000, + .rate_max = 48000, + .nr_rates = 1, + .rate_table = (unsigned int[]) { 48000 } + } + }, + { + .ifnum = -1 + } + } + } +}, + #undef USB_DEVICE_VENDOR_SPEC #undef USB_AUDIO_DEVICE