summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christian de Rivaz <jc@eclis.ch>2012-10-10 12:49:02 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-21 09:17:11 -0700
commit298d0427b4f0887098d7c3b66a919214f7f433e6 (patch)
tree88cc423848d9632cf67c1149bfb4068cd624cf5c
parentdfd5603c251a87fbfcaef5d492656ae9011c9f7a (diff)
downloadlinux-stable-298d0427b4f0887098d7c3b66a919214f7f433e6.tar.gz
linux-stable-298d0427b4f0887098d7c3b66a919214f7f433e6.tar.bz2
linux-stable-298d0427b4f0887098d7c3b66a919214f7f433e6.zip
Add CDC-ACM support for the CX93010-2x UCMxx USB Modem
commit e7d491a19d3e3aac544070293891a2542ae0c565 upstream. This USB V.92/V.32bis Controllered Modem have the USB vendor ID 0x0572 and device ID 0x1340. It need the NO_UNION_NORMAL quirk to be recognized. Reference: http://www.conexant.com/servlets/DownloadServlet/DSH-201723-005.pdf?docid=1725&revid=5 See idVendor and idProduct in table 6-1. Device Descriptors Signed-off-by: Jean-Christian de Rivaz <jc@eclis.ch> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 de80171f9582..3b2ce7d06e8a 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1496,6 +1496,9 @@ static const struct usb_device_id acm_ids[] = {
Maybe we should define a new
quirk for this. */
},
+ { USB_DEVICE(0x0572, 0x1340), /* Conexant CX93010-2x UCMxx */
+ .driver_info = NO_UNION_NORMAL,
+ },
{ USB_DEVICE(0x1bbb, 0x0003), /* Alcatel OT-I650 */
.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
},