diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-23 08:01:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-23 08:01:20 +0100 |
| commit | 6203da9803017701da5782998157d9826215059d (patch) | |
| tree | 1d754f139ac25c643e88f429966606d3b44e431f /drivers/usb/core/quirks.c | |
| parent | staging: vt6656: Use BIT() macro in vnt_mac_reg_bits_* functions (diff) | |
| parent | Linux 5.6-rc7 (diff) | |
| download | linux-dev-6203da9803017701da5782998157d9826215059d.tar.xz linux-dev-6203da9803017701da5782998157d9826215059d.zip | |
Merge 5.6-rc7 into staging-next
We need the staging/iio fixes in here as well
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/quirks.c')
| -rw-r--r-- | drivers/usb/core/quirks.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index 2b24336a72e5..da30b5664ff3 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -231,6 +231,9 @@ static const struct usb_device_id usb_quirk_list[] = { /* Logitech PTZ Pro Camera */ { USB_DEVICE(0x046d, 0x0853), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Logitech Screen Share */ + { USB_DEVICE(0x046d, 0x086c), .driver_info = USB_QUIRK_NO_LPM }, + /* Logitech Quickcam Fusion */ { USB_DEVICE(0x046d, 0x08c1), .driver_info = USB_QUIRK_RESET_RESUME }, @@ -375,6 +378,12 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x0b05, 0x17e0), .driver_info = USB_QUIRK_IGNORE_REMOTE_WAKEUP }, + /* Realtek hub in Dell WD19 (Type-C) */ + { USB_DEVICE(0x0bda, 0x0487), .driver_info = USB_QUIRK_NO_LPM }, + + /* Generic RTL8153 based ethernet adapters */ + { USB_DEVICE(0x0bda, 0x8153), .driver_info = USB_QUIRK_NO_LPM }, + /* Action Semiconductor flash disk */ { USB_DEVICE(0x10d6, 0x2200), .driver_info = USB_QUIRK_STRING_FETCH_255 }, |