summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDmitriy Taychenachev <dimichxp@gmail.com>2009-02-25 12:36:51 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-03-16 17:32:04 -0700
commite8c0f6bbd71a4612ac604879593be7b8d225d28c (patch)
tree9143a986f1cf5e2a30e2d8048caee7f7217454b2 /drivers
parenteba069461dcf7564466a34b7d8681c92464cb980 (diff)
USB: cdc-acm: add usb id for motomagx phones
commit 155df65ae11dfc322214c6f887185929c809df1b upstream. The Motorola MOTOMAGX phones (Z6, E8, Zn5 so far) are providing 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 cdc-acm driver can properly handle this combined device. Signed-off-by: Dmitriy Taychenachev <dimichxp@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/class/cdc-acm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index d50a99f70aee..4b3549baf191 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1370,6 +1370,8 @@ static struct usb_device_id acm_ids[] = {
{ USB_DEVICE(0x0572, 0x1321), /* Conexant USB MODEM CX93010 */
.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,