| From 895d240d1db0b2736d779200788e4c4aea28a0c6 Mon Sep 17 00:00:00 2001 |
| From: Michael Ulbricht <michael.ulbricht@systec-electronic.com> |
| Date: Tue, 25 Mar 2014 10:34:18 +0100 |
| Subject: USB: cdc-acm: Remove Motorola/Telit H24 serial interfaces from ACM driver |
| |
| From: Michael Ulbricht <michael.ulbricht@systec-electronic.com> |
| |
| 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.ulbricht@systec-electronic.com> |
| Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> |
| Signed-off-by: Oliver Neukum <oliver@neukum.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/class/cdc-acm.c | 28 +++++++++++++++++++++------- |
| 1 file changed, 21 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/usb/class/cdc-acm.c |
| +++ b/drivers/usb/class/cdc-acm.c |
| @@ -1652,13 +1652,27 @@ static const struct usb_device_id acm_id |
| }, |
| /* 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 |