USB: option: add and update Alcatel modems (f8f0302b) · Commits · 戴 / test

Adding three currently unsupported modems based on information from .inf driver files: Diag VID_1BBB&PID_0052&MI_00 AGPS VID_1BBB&PID_0052&MI_01 VOICE VID_1BBB&PID_0052&MI_02 AT VID_1BBB&PID_0052&MI_03 Modem VID_1BBB&PID_0052&MI_05 wwan VID_1BBB&PID_0052&MI_06 Diag VID_1BBB&PID_00B6&MI_00 AT VID_1BBB&PID_00B6&MI_01 Modem VID_1BBB&PID_00B6&MI_02 wwan VID_1BBB&PID_00B6&MI_03 Diag VID_1BBB&PID_00B7&MI_00 AGPS VID_1BBB&PID_00B7&MI_01 VOICE VID_1BBB&PID_00B7&MI_02 AT VID_1BBB&PID_00B7&MI_03 Modem VID_1BBB&PID_00B7&MI_04 wwan VID_1BBB&PID_00B7&MI_05 Updating the blacklist info for the X060S_X200 and X220_X500D, reserving interfaces for a wwan driver, based on wwan VID_1BBB&PID_0000&MI_04 wwan VID_1BBB&PID_0017&MI_06 Cc: stable <stable@vger.kernel.org> Signed-off-by:

Bjørn Mork <bjorn@mork.no> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/serial/option.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -470,6 +470,7 @@ static const struct option_blacklist_info four_g_w14_blacklist = {

		static const struct option_blacklist_info alcatel_x200_blacklist = {
		.sendsetup = BIT(0) \| BIT(1),
		.reserved = BIT(4),
		};

		static const struct option_blacklist_info zte_0037_blacklist = {
		@@ -1198,7 +1199,14 @@ static const struct usb_device_id option_ids[] = {
		{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
		.driver_info = (kernel_ulong_t)&alcatel_x200_blacklist
		},
		{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) },
		{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),
		.driver_info = (kernel_ulong_t)&net_intf6_blacklist },
		{ USB_DEVICE(ALCATEL_VENDOR_ID, 0x0052),
		.driver_info = (kernel_ulong_t)&net_intf6_blacklist },
		{ USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b6),
		.driver_info = (kernel_ulong_t)&net_intf3_blacklist },
		{ USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b7),
		.driver_info = (kernel_ulong_t)&net_intf5_blacklist },
		{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V),
		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
		{ USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },

Admin message