diff options
| author | Michael Ulbricht <michael.ulbricht@systec-electronic.com> | 2014-03-25 05:34:18 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-16 17:03:40 -0400 |
| commit | 895d240d1db0b2736d779200788e4c4aea28a0c6 (patch) | |
| tree | dae9d5e4bf9ceb1520e4c0a45924d5e9c1f12413 /drivers/usb/class/cdc-acm.c | |
| parent | 166cf4aa354c0066cb1903336382772e9e1b7941 (diff) | |
USB: cdc-acm: Remove Motorola/Telit H24 serial interfaces from ACM driver
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>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index d5d2c922186a..904efb6035b0 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -1654,13 +1654,27 @@ static const struct usb_device_id acm_ids[] = { | |||
| 1654 | }, | 1654 | }, |
| 1655 | /* Motorola H24 HSPA module: */ | 1655 | /* Motorola H24 HSPA module: */ |
| 1656 | { USB_DEVICE(0x22b8, 0x2d91) }, /* modem */ | 1656 | { USB_DEVICE(0x22b8, 0x2d91) }, /* modem */ |
| 1657 | { USB_DEVICE(0x22b8, 0x2d92) }, /* modem + diagnostics */ | 1657 | { USB_DEVICE(0x22b8, 0x2d92), /* modem + diagnostics */ |
| 1658 | { USB_DEVICE(0x22b8, 0x2d93) }, /* modem + AT port */ | 1658 | .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ |
| 1659 | { USB_DEVICE(0x22b8, 0x2d95) }, /* modem + AT port + diagnostics */ | 1659 | }, |
| 1660 | { USB_DEVICE(0x22b8, 0x2d96) }, /* modem + NMEA */ | 1660 | { USB_DEVICE(0x22b8, 0x2d93), /* modem + AT port */ |
| 1661 | { USB_DEVICE(0x22b8, 0x2d97) }, /* modem + diagnostics + NMEA */ | 1661 | .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ |
| 1662 | { USB_DEVICE(0x22b8, 0x2d99) }, /* modem + AT port + NMEA */ | 1662 | }, |
| 1663 | { USB_DEVICE(0x22b8, 0x2d9a) }, /* modem + AT port + diagnostics + NMEA */ | 1663 | { USB_DEVICE(0x22b8, 0x2d95), /* modem + AT port + diagnostics */ |
| 1664 | .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ | ||
| 1665 | }, | ||
| 1666 | { USB_DEVICE(0x22b8, 0x2d96), /* modem + NMEA */ | ||
| 1667 | .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ | ||
| 1668 | }, | ||
| 1669 | { USB_DEVICE(0x22b8, 0x2d97), /* modem + diagnostics + NMEA */ | ||
| 1670 | .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ | ||
| 1671 | }, | ||
| 1672 | { USB_DEVICE(0x22b8, 0x2d99), /* modem + AT port + NMEA */ | ||
| 1673 | .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ | ||
| 1674 | }, | ||
| 1675 | { USB_DEVICE(0x22b8, 0x2d9a), /* modem + AT port + diagnostics + NMEA */ | ||
| 1676 | .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ | ||
| 1677 | }, | ||
| 1664 | 1678 | ||
| 1665 | { USB_DEVICE(0x0572, 0x1329), /* Hummingbird huc56s (Conexant) */ | 1679 | { USB_DEVICE(0x0572, 0x1329), /* Hummingbird huc56s (Conexant) */ |
| 1666 | .driver_info = NO_UNION_NORMAL, /* union descriptor misplaced on | 1680 | .driver_info = NO_UNION_NORMAL, /* union descriptor misplaced on |