Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 895d240d authored by Michael Ulbricht's avatar Michael Ulbricht Committed by Greg Kroah-Hartman
Browse files

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: default avatarMichael Ulbricht <michael.ulbricht@systec-electronic.com>
Signed-off-by: default avatarAlexander Stein <alexander.stein@systec-electronic.com>
Signed-off-by: default avatarOliver Neukum <oliver@neukum.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 166cf4aa

drivers/usb/class/cdc-acm.c

+21 −7
Original line number Diff line number Diff line
@@ -1654,13 +1654,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