summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hsu <mhsu@nvidia.com>2011-07-14 16:49:15 -0700
committerVarun Colbert <vcolbert@nvidia.com>2011-07-15 16:43:17 -0700
commit621614719837f9ff5664d9de523930ca3b216a7a (patch)
tree10dd20e0068849022d4f2f4e9fcd1c61146579ba
parent1e23df5e809221c74fe5ace84108222efa70b9b7 (diff)
arm: tegra: usb: Exclude incompatible device from CDC-ACM driver.
A certain flashless modem has a boot ROM which incorrectly reports itself as being USB CDC-ACM class compliant. Prevent the CDC-ACM driver from printing error message about "This device cannot do calls on its own. It is not a modem." when this device is present on usb bus. Change-Id: If1ef27980b3cc454233309a5066070e6250dd24e Reviewed-on: http://git-master/r/41105 Reviewed-by: Michael Hsu <mhsu@nvidia.com> Tested-by: Michael Hsu <mhsu@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--drivers/usb/class/cdc-acm.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 155ba672d1d5..88cabb228e13 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1619,6 +1619,11 @@ static const struct usb_device_id acm_ids[] = {
.driver_info = NOT_A_MODEM,
},
+ /* Exclude XMM6260 boot rom (not running modem software yet) */
+ { USB_DEVICE(0x058b, 0x0041),
+ .driver_info = NOT_A_MODEM,
+ },
+
/* control interfaces without any protocol set */
{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
USB_CDC_PROTO_NONE) },