summaryrefslogtreecommitdiff
path: root/drivers/usb/class/cdc-acm.c
diff options
context:
space:
mode:
authorMichael Hsu <mhsu@nvidia.com>2011-07-14 16:49:15 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:47:43 -0800
commit89e04f1debe994d0161e9a519b53f74f9fd4d347 (patch)
tree2383cb0adf9773912eb6f3e2e4fbbc5bc72d0875 /drivers/usb/class/cdc-acm.c
parent6a37b73f095b5d34971ca14ea800daea960a7d1f (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. Original-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> Rebase-Id: Ra7b68fb265acffe22a2de5d31bad82363607b87e
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
-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 73ea9ca888c6..acd4285e87d4 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1554,6 +1554,11 @@ static const struct usb_device_id acm_ids[] = {
.driver_info = NO_DATA_INTERFACE,
},
+ /* 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) },