summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMichael Hsu <mhsu@nvidia.com>2011-05-05 12:12:47 -0700
committerVarun Colbert <vcolbert@nvidia.com>2011-05-11 15:20:44 -0700
commitd3652cd838b9dea9fdb34476f93a3f0acbb78615 (patch)
tree02546a47c08cead2286280e537e8f83d836c4ac0 /drivers
parentf6ce86a2b794942a66a9a61d18f0734a2c156ab9 (diff)
usb: cdc-acm: Add supported modem to CDC-ACM driver.
Prevent CDC-ACM driver from creating tty devices for each USB interface on supported modem. Only create one tty device, leaving other USB interfaces available for other uses (such as RAW-IP). Change-Id: I457659783c61f3f76e8026683dbbf2ddb3098ba2 Reviewed-on: http://git-master/r/30599 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/class/cdc-acm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index bc62fae0680f..155ba672d1d5 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1547,6 +1547,9 @@ static const struct usb_device_id acm_ids[] = {
{ USB_DEVICE(0x1576, 0x03b1), /* Maretron USB100 */
.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
},
+ { USB_DEVICE(0x1519, 0x0020),
+ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
+ },
/* Nokia S60 phones expose two ACM channels. The first is
* a modem and is picked up by the standard AT-command