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

Commit eb2addd4 authored by Michal Malý's avatar Michal Malý Committed by Greg Kroah-Hartman
Browse files

USB: serial: option: Ignore card reader interface on Huawei E1750 



Hi,

my Huawei 3G modem has an embedded Smart Card reader which causes
trouble when the modem is being detected (a bunch of "<warn>  (ttyUSBx):
open blocked by driver for more than 7 seconds!" in messages.log). This
trivial patch corrects the problem for me. The modem identifies itself
as "12d1:1406 Huawei Technologies Co., Ltd. E1750" in lsusb although the
description on the body says "Model E173u-1"

Signed-off-by: default avatarMichal Malý <madcatxster@prifuk.cz>
Cc: Bjørn Mork <bjorn@mork.no>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15c03dd4

drivers/usb/serial/option.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,7 @@ static void option_instat_callback(struct urb *urb); 




#define HUAWEI_VENDOR_ID			0x12D1

#define HUAWEI_VENDOR_ID			0x12D1

#define HUAWEI_PRODUCT_E173			0x140C

#define HUAWEI_PRODUCT_E173			0x140C

#define HUAWEI_PRODUCT_E1750			0x1406

#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
@@ -567,6 +568,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_E1750, 0xff, 0xff, 0xff),

		.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) },

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

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

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

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