diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-07-18 17:42:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-07-18 17:42:40 +0200 |
| commit | 67ece13ffe862f9d17a144c6cd3feef88a57db13 (patch) | |
| tree | ec2036681d19a9c10b2fad941eb8f58f9eafcfc8 /drivers/usb/class/cdc-acm.c | |
| parent | fa84cf094ef9667e2b91c104b0a788fd1896f482 (diff) | |
| parent | 4aaf448fa9754e2d5ee188d32327b24ffc15ca4d (diff) | |
Merge branch 'topic/vga_switcheroo' into for-next
Pull the vga_switcheroo audio client fix.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 7b366a6c0b493..998b32d0167e9 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1758,6 +1758,9 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0x11ca, 0x0201), /* VeriFone Mx870 Gadget Serial */ .driver_info = SINGLE_RX_URB, }, + { USB_DEVICE(0x1965, 0x0018), /* Uniden UBC125XLT */ + .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ + }, { USB_DEVICE(0x22b8, 0x7000), /* Motorola Q Phone */ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ }, |