diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-07-18 14:31:54 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-07-18 14:31:54 +0800 |
| commit | 16e243013beb93902693c4bb90e4348c99588429 (patch) | |
| tree | 6a5858d948085974ef1f26bb1e4b546cfb44cfc5 /drivers/usb/core/quirks.c | |
| parent | 2120557722577d8cff75a33a799ad15582dbd8ef (diff) | |
| parent | 5289d9c979092878f2bf741d8b365ef7565fb6db (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-17.07-android
Diffstat (limited to 'drivers/usb/core/quirks.c')
| -rw-r--r-- | drivers/usb/core/quirks.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index 96b21b0dac1e..3116edfcdc18 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -223,6 +223,10 @@ static const struct usb_device_id usb_quirk_list[] = { /* Blackmagic Design UltraStudio SDI */ { USB_DEVICE(0x1edb, 0xbd4f), .driver_info = USB_QUIRK_NO_LPM }, + /* Hauppauge HVR-950q */ + { USB_DEVICE(0x2040, 0x7200), .driver_info = + USB_QUIRK_CONFIG_INTF_STRINGS }, + /* INTEL VALUE SSD */ { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME }, |