diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-21 09:06:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-21 09:06:42 +0200 |
| commit | 629b9111535f2a2607bbea1599d285a25f32835d (patch) | |
| tree | 81a37df4e13842d5ea3d54b619e929e2b6e9ffed /drivers/usb/core | |
| parent | 673d74683627bc78eaca1fdbe24b6cf45c5c8d84 (diff) | |
| parent | ba4f184e126b751d1bffad5897f263108befc780 (diff) | |
| download | linux-stable-629b9111535f2a2607bbea1599d285a25f32835d.tar.gz linux-stable-629b9111535f2a2607bbea1599d285a25f32835d.tar.bz2 linux-stable-629b9111535f2a2607bbea1599d285a25f32835d.zip | |
Merge 5.0-rc6 into usb-next
We want the USB fixes in here, and this resolves a merge issue in the
uas driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
| -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 f232914de5fd..10574fa3f927 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -397,6 +397,10 @@ static const struct usb_device_id usb_quirk_list[] = { /* Generic RTL8153 based ethernet adapters */ { USB_DEVICE(0x0bda, 0x8153), .driver_info = USB_QUIRK_NO_LPM }, + /* SONiX USB DEVICE Touchpad */ + { USB_DEVICE(0x0c45, 0x7056), .driver_info = + USB_QUIRK_IGNORE_REMOTE_WAKEUP }, + /* Action Semiconductor flash disk */ { USB_DEVICE(0x10d6, 0x2200), .driver_info = USB_QUIRK_STRING_FETCH_255 }, |