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

Commit 8f173e22 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Greg Kroah-Hartman
Browse files

USB: serial: option: blacklist interface 1 for Huawei E173s-6 



Interface 1 on this device isn't for option to bind to otherwise an oops
on usb_wwan with log flooding will happen when accessing the port:

tty_release: ttyUSB1: read/write wait queue active!

It doesn't seem to respond to QMI if it's added to qmi_wwan so don't add
it there - it's likely used by the card reader.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d63e502d

drivers/usb/serial/option.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -85,6 +85,7 @@ static void option_instat_callback(struct urb *urb); 
#define HUAWEI_PRODUCT_K4505			0x1464

#define HUAWEI_PRODUCT_K4505			0x1464

#define HUAWEI_PRODUCT_K3765			0x1465

#define HUAWEI_PRODUCT_K3765			0x1465

#define HUAWEI_PRODUCT_K4605			0x14C6

#define HUAWEI_PRODUCT_K4605			0x14C6

#define HUAWEI_PRODUCT_E173S6			0x1C07





#define QUANTA_VENDOR_ID			0x0408

#define QUANTA_VENDOR_ID			0x0408

#define QUANTA_PRODUCT_Q101			0xEA02

#define QUANTA_PRODUCT_Q101			0xEA02
@@ -572,6 +573,8 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff),

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff),

		.driver_info = (kernel_ulong_t) &net_intf1_blacklist },

		.driver_info = (kernel_ulong_t) &net_intf1_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S6, 0xff, 0xff, 0xff),

		.driver_info = (kernel_ulong_t) &net_intf1_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1750, 0xff, 0xff, 0xff),

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1750, 0xff, 0xff, 0xff),

		.driver_info = (kernel_ulong_t) &net_intf2_blacklist },

		.driver_info = (kernel_ulong_t) &net_intf2_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) },