diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-05-28 10:08:46 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-05-28 10:08:50 +0200 |
| commit | 6d2848402619f33895e419430ad43a223c4866fc (patch) | |
| tree | a88115a04139f68e5240dfdf40e11c752a3e73a5 /sound/usb/quirks.c | |
| parent | ALSA: firewire-motu: add support for MOTU UltraLite-mk3 (FireWire only model) (diff) | |
| parent | ALSA: hda/realtek - Add new codec supported for ALC287 (diff) | |
| download | wireguard-linux-6d2848402619f33895e419430ad43a223c4866fc.tar.xz wireguard-linux-6d2848402619f33895e419430ad43a223c4866fc.zip | |
Merge branch 'for-linus' into for-next
Back-merge 5.7-devel branch for further development.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/quirks.c')
| -rw-r--r-- | sound/usb/quirks.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index a8ece1701068..c0e3bc4afec6 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1636,13 +1636,14 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) msleep(20); - /* Zoom R16/24, Logitech H650e, Jabra 550a needs a tiny delay here, - * otherwise requests like get/set frequency return as failed despite - * actually succeeding. + /* Zoom R16/24, Logitech H650e, Jabra 550a, Kingston HyperX needs a tiny + * delay here, otherwise requests like get/set frequency return as + * failed despite actually succeeding. */ if ((chip->usb_id == USB_ID(0x1686, 0x00dd) || chip->usb_id == USB_ID(0x046d, 0x0a46) || - chip->usb_id == USB_ID(0x0b0e, 0x0349)) && + chip->usb_id == USB_ID(0x0b0e, 0x0349) || + chip->usb_id == USB_ID(0x0951, 0x16ad)) && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) usleep_range(1000, 2000); } @@ -1687,7 +1688,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, case USB_ID(0x0d8c, 0x0316): /* Hegel HD12 DSD */ case USB_ID(0x10cb, 0x0103): /* The Bit Opus #3; with fp->dsd_raw */ - case USB_ID(0x16b0, 0x06b2): /* NuPrime DAC-10 */ + case USB_ID(0x16d0, 0x06b2): /* NuPrime DAC-10 */ case USB_ID(0x16d0, 0x09dd): /* Encore mDSD */ case USB_ID(0x16d0, 0x0733): /* Furutech ADL Stratos */ case USB_ID(0x16d0, 0x09db): /* NuPrime Audio DAC-9 */ |