summaryrefslogtreecommitdiff
path: root/drivers/usb/core/quirks.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-01-29 12:04:54 +0000
committerMark Brown <broonie@kernel.org>2019-01-29 12:04:54 +0000
commitd7c26e63cf78fef01d66ae848184c6ee5f4b8bbf (patch)
tree3765745a38a7ae1a4a3a056dfc6c736e4c99271d /drivers/usb/core/quirks.c
parenta8233b6c1972e1959cf84a021aeb61ddcd23cc26 (diff)
parentf17b5f06cb92ef2250513a1e154c47b78df07d40 (diff)
Merge tag 'v5.0-rc4' into asoc-5.1
Linux 5.0-rc4
Diffstat (limited to 'drivers/usb/core/quirks.c')
-rw-r--r--drivers/usb/core/quirks.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 514c5214ddb2..8bc35d53408b 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -394,7 +394,8 @@ static const struct usb_device_id usb_quirk_list[] = {
{ USB_DEVICE(0x1a40, 0x0101), .driver_info = USB_QUIRK_HUB_SLOW_RESET },
/* Corsair K70 RGB */
- { USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT },
+ { USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT |
+ USB_QUIRK_DELAY_CTRL_MSG },
/* Corsair Strafe */
{ USB_DEVICE(0x1b1c, 0x1b15), .driver_info = USB_QUIRK_DELAY_INIT |