Commit 0372a754 authored by Andrew Bird's avatar Andrew Bird Committed by Greg Kroah-Hartman
Browse files

USB: option: add huawei k3765 k4505 devices to work properly 



This patch adds the product IDs of Huawei's K3765 and K4505 mobile
broadband usb modems to option.c. It also adds a quirk to the option
probe function so that binding to the device's network interface(class
0xff) is avoided. This is necessary to allow another driver to bind to
that, and to avoid programs like wvdial opening a nonfunctioning tty
during modem discovery.

Signed-off-by: default avatarAndrew Bird <ajb@spheresystems.co.uk>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 56706491

drivers/usb/serial/option.c

+11 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ static void option_instat_callback(struct urb *urb); 
#define HUAWEI_PRODUCT_E143D			0x143D

#define HUAWEI_PRODUCT_E143E			0x143E

#define HUAWEI_PRODUCT_E143F			0x143F

#define HUAWEI_PRODUCT_K4505			0x1464

#define HUAWEI_PRODUCT_K3765			0x1465

#define HUAWEI_PRODUCT_E14AC			0x14AC

#define HUAWEI_PRODUCT_ETS1220			0x1803
@@ -480,6 +482,8 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 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_K3765, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) },

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */
@@ -1015,6 +1019,13 @@ static int option_probe(struct usb_serial *serial, 
		serial->interface->cur_altsetting->desc.bInterfaceClass != 0xff)

		return -ENODEV;



	/* Don't bind network interfaces on Huawei K3765 & K4505 */

	if (serial->dev->descriptor.idVendor == HUAWEI_VENDOR_ID &&

		(serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K3765 ||

			serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4505) &&

		serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)

		return -ENODEV;



	data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL);



	if (!data)

CRA Git | Maintained and supported by SUSTech CRA and CCSE