projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| d4e679d4 GKH |
1 | From 155df65ae11dfc322214c6f887185929c809df1b Mon Sep 17 00:00:00 2001 |
| 2 | From: Dmitriy Taychenachev <dimichxp@gmail.com> | |
| 3 | Date: Wed, 25 Feb 2009 12:36:51 +0800 | |
| 4 | Subject: USB: cdc-acm: add usb id for motomagx phones | |
| 5 | ||
| 6 | From: Dmitriy Taychenachev <dimichxp@gmail.com> | |
| 7 | ||
| 8 | commit 155df65ae11dfc322214c6f887185929c809df1b upstream. | |
| 9 | ||
| 10 | The Motorola MOTOMAGX phones (Z6, E8, Zn5 so far) are providing | |
| 11 | combined ACM/BLAN USB configuration. Since it has Vendor Specific | |
| 12 | class, the corresponding drivers (cdc-acm, zaurus) can't find it just | |
| 13 | by interface info. This patch adds usb id so the cdc-acm driver can | |
| 14 | properly handle this combined device. | |
| 15 | ||
| 16 | Signed-off-by: Dmitriy Taychenachev <dimichxp@gmail.com> | |
| 17 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 18 | ||
| 19 | --- | |
| 20 | drivers/usb/class/cdc-acm.c | 2 ++ | |
| 21 | 1 file changed, 2 insertions(+) | |
| 22 | ||
| 23 | --- a/drivers/usb/class/cdc-acm.c | |
| 24 | +++ b/drivers/usb/class/cdc-acm.c | |
| 25 | @@ -1370,6 +1370,8 @@ static struct usb_device_id acm_ids[] = | |
| 26 | { USB_DEVICE(0x0572, 0x1321), /* Conexant USB MODEM CX93010 */ | |
| 27 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ | |
| 28 | }, | |
| 29 | + { USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */ | |
| 30 | + }, | |
| 31 | ||
| 32 | /* control interfaces with various AT-command sets */ | |
| 33 | { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, |