From: Michael Ulbricht <michael.ulbri...@systec-electronic.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
commit 895d240d1db0b2736d779200788e4c4aea28a0c6 upstream.
By specifying NO_UNION_NORMAL the ACM driver does only use the first two
USB interfaces (modem data & control). The AT Port, Diagnostic and NMEA
interfaces are left to the USB serial driver.
Signed-off-by: Michael Ulbricht <michael.ulbri...@systec-electronic.com>
Signed-off-by: Alexander Stein <alexander.st...@systec-electronic.com>
Signed-off-by: Oliver Neukum <oli...@neukum.org>
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
---
drivers/usb/class/cdc-acm.c | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index e8404319ca68..0b5e381bcbe6 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1560,13 +1560,27 @@ static const struct usb_device_id acm_ids[] = {
},
/* Motorola H24 HSPA module: */
{ USB_DEVICE(0x22b8, 0x2d91) }, /* modem
*/
- { USB_DEVICE(0x22b8, 0x2d92) }, /* modem + diagnostics
*/
- { USB_DEVICE(0x22b8, 0x2d93) }, /* modem + AT port
*/
- { USB_DEVICE(0x22b8, 0x2d95) }, /* modem + AT port + diagnostics
*/
- { USB_DEVICE(0x22b8, 0x2d96) }, /* modem + NMEA
*/
- { USB_DEVICE(0x22b8, 0x2d97) }, /* modem + diagnostics + NMEA
*/
- { USB_DEVICE(0x22b8, 0x2d99) }, /* modem + AT port + NMEA
*/
- { USB_DEVICE(0x22b8, 0x2d9a) }, /* modem + AT port + diagnostics + NMEA
*/
+ { USB_DEVICE(0x22b8, 0x2d92), /* modem + diagnostics
*/
+ .driver_info = NO_UNION_NORMAL, /* handle only modem interface
*/
+ },
+ { USB_DEVICE(0x22b8, 0x2d93), /* modem + AT port
*/
+ .driver_info = NO_UNION_NORMAL, /* handle only modem interface
*/
+ },
+ { USB_DEVICE(0x22b8, 0x2d95), /* modem + AT port + diagnostics
*/
+ .driver_info = NO_UNION_NORMAL, /* handle only modem interface
*/
+ },
+ { USB_DEVICE(0x22b8, 0x2d96), /* modem + NMEA
*/
+ .driver_info = NO_UNION_NORMAL, /* handle only modem interface
*/
+ },
+ { USB_DEVICE(0x22b8, 0x2d97), /* modem + diagnostics + NMEA
*/
+ .driver_info = NO_UNION_NORMAL, /* handle only modem interface
*/
+ },
+ { USB_DEVICE(0x22b8, 0x2d99), /* modem + AT port + NMEA
*/
+ .driver_info = NO_UNION_NORMAL, /* handle only modem interface
*/
+ },
+ { USB_DEVICE(0x22b8, 0x2d9a), /* modem + AT port + diagnostics + NMEA
*/
+ .driver_info = NO_UNION_NORMAL, /* handle only modem interface
*/
+ },
{ USB_DEVICE(0x0572, 0x1329), /* Hummingbird huc56s (Conexant) */
.driver_info = NO_UNION_NORMAL, /* union descriptor misplaced on
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
