# HG changeset patch
# User Dmitriy Taychenachev <dimichxp@xxxxxxxxx>
# Date 1235452988 -28800
# Node ID 88f889b92bc0d9dc3c142ca9ad38a3a63eb7e030
# Parent 3156aeae06eaf47bc5dd94ff231c7122ffcdd9ea
Add usb id for motomagx phones to zaurus and cdc-acm drivers.
The Motorola MOTOMAGX phones (Z6, E8, Zn5 so far) are providing
combined combined ACM/BLAN USB configuration. Since it has Vendor
Specific class, the corresponding drivers (cdc-acm, zaurus) can't find
it just by interface info. This patch adds usb id so the drivers can
properly handle this combined device.
Signed-off-by: Dmitriy Taychenachev <dimichxp@xxxxxxxxx>
diff -r 3156aeae06ea -r 88f889b92bc0 drivers/net/usb/zaurus.c
--- a/drivers/net/usb/zaurus.c Mon Feb 23 20:29:21 2009 -0800
+++ b/drivers/net/usb/zaurus.c Tue Feb 24 13:23:08 2009 +0800
@@ -341,8 +341,14 @@
USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MDLM,
USB_CDC_PROTO_NONE),
.driver_info = (unsigned long) &bogus_mdlm_info,
+}, {
+ /* Motorola MOTOMAGX phones */
+ USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x6425, USB_CLASS_COMM,
+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+ .driver_info = (unsigned long) &bogus_mdlm_info,
},
+
/* Olympus has some models with a Zaurus-compatible option.
* R-1000 uses a FreeScale i.MXL cpu (ARMv4T)
*/
diff -r 3156aeae06ea -r 88f889b92bc0 drivers/usb/class/cdc-acm.c
--- a/drivers/usb/class/cdc-acm.c Mon Feb 23 20:29:21 2009 -0800
+++ b/drivers/usb/class/cdc-acm.c Tue Feb 24 13:23:08 2009 +0800
@@ -1376,6 +1376,8 @@
{ USB_DEVICE(0x0572, 0x1324), /* Conexant USB MODEM RD02-D400 */
.driver_info = NO_UNION_NORMAL, /* has no union descriptor */
},
+ { USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */
+ },
/* control interfaces with various AT-command sets */
{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
