summaryrefslogtreecommitdiffstats
path: root/drivers/usb/class/cdc-acm.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2019-03-05 15:24:43 +0100
committerJiri Kosina <jkosina@suse.cz>2019-03-05 15:24:43 +0100
commit2c2e5bb97544198a62e4edbf6aca5dd201979564 (patch)
treeffb927ea311d86aeee3a0ef561d6218280c038cb /drivers/usb/class/cdc-acm.c
parent9b6872a123862cecd19a958f08eb9848b6a4240d (diff)
parent6311d329e12a358a9813d2e929d26fbc5a4c73c2 (diff)
downloadtalos-op-linux-2c2e5bb97544198a62e4edbf6aca5dd201979564.tar.gz
talos-op-linux-2c2e5bb97544198a62e4edbf6aca5dd201979564.zip
Merge branch 'for-5.1/hid-asus' into for-linus
Asus Transbook T100CHI and T90CHI support from NOGUCHI Hiroshi
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
-rw-r--r--drivers/usb/class/cdc-acm.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index ed8c62b2d9d1..739f8960811a 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1865,6 +1865,13 @@ static const struct usb_device_id acm_ids[] = {
.driver_info = IGNORE_DEVICE,
},
+ { USB_DEVICE(0x1bc7, 0x0021), /* Telit 3G ACM only composition */
+ .driver_info = SEND_ZERO_PACKET,
+ },
+ { USB_DEVICE(0x1bc7, 0x0023), /* Telit 3G ACM + ECM composition */
+ .driver_info = SEND_ZERO_PACKET,
+ },
+
/* control interfaces without any protocol set */
{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
USB_CDC_PROTO_NONE) },
OpenPOWER on IntegriCloud