]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.0-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Oct 2012 20:46:40 +0000 (13:46 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Oct 2012 20:46:40 +0000 (13:46 -0700)
added patches:
add-cdc-acm-support-for-the-cx93010-2x-ucmxx-usb-modem.patch

queue-3.0/add-cdc-acm-support-for-the-cx93010-2x-ucmxx-usb-modem.patch [new file with mode: 0644]
queue-3.0/series

diff --git a/queue-3.0/add-cdc-acm-support-for-the-cx93010-2x-ucmxx-usb-modem.patch b/queue-3.0/add-cdc-acm-support-for-the-cx93010-2x-ucmxx-usb-modem.patch
new file mode 100644 (file)
index 0000000..5611fc5
--- /dev/null
@@ -0,0 +1,36 @@
+From e7d491a19d3e3aac544070293891a2542ae0c565 Mon Sep 17 00:00:00 2001
+From: Jean-Christian de Rivaz <jc@eclis.ch>
+Date: Wed, 10 Oct 2012 12:49:02 +0000
+Subject: Add CDC-ACM support for the CX93010-2x UCMxx USB Modem
+
+From: Jean-Christian de Rivaz <jc@eclis.ch>
+
+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>
+
+---
+ drivers/usb/class/cdc-acm.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- 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_id
+                                          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 */
+       },
index a0fe03af353956436a623e35590dfd01f55da295..a45cd844f881c79d7fcfec7fb9068eb531a98071 100644 (file)
@@ -26,3 +26,4 @@ netfilter-nf_nat_sip-fix-via-header-translation-with-multiple-parameters.patch
 netfilter-nf_ct_expect-fix-possible-access-to-uninitialized-timer.patch
 netfilter-limit-hashlimit-avoid-duplicated-inline.patch
 netfilter-xt_limit-have-r-cost-0-case-work.patch
+add-cdc-acm-support-for-the-cx93010-2x-ucmxx-usb-modem.patch