From: Greg Kroah-Hartman Date: Wed, 17 Oct 2012 20:46:45 +0000 (-0700) Subject: 3.4-stable patches X-Git-Tag: v3.0.47~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1c7ff050f5e21db2d6cc298cf5cdb6a6f6be223;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: add-cdc-acm-support-for-the-cx93010-2x-ucmxx-usb-modem.patch --- diff --git a/queue-3.4/add-cdc-acm-support-for-the-cx93010-2x-ucmxx-usb-modem.patch b/queue-3.4/add-cdc-acm-support-for-the-cx93010-2x-ucmxx-usb-modem.patch new file mode 100644 index 00000000000..e89338ab08f --- /dev/null +++ b/queue-3.4/add-cdc-acm-support-for-the-cx93010-2x-ucmxx-usb-modem.patch @@ -0,0 +1,36 @@ +From e7d491a19d3e3aac544070293891a2542ae0c565 Mon Sep 17 00:00:00 2001 +From: Jean-Christian de Rivaz +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 + +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 +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -1551,6 +1551,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 */ + }, diff --git a/queue-3.4/series b/queue-3.4/series index f14c788b4fe..256ade9677b 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -41,3 +41,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