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

Commit 3095ec89 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "USB: option: add ID for ZTE MF 330" 



This reverts commit a559d2c8.

Turns out that device id 0x1d6b:0x0002 is a USB hub, which causes havoc
when the option driver tries to bind to it.

So revert this as it doesn't seem to be needed at all.

Thanks to Michael Tokarev and Paweł Drobek for working on resolving this
issue.

Cc: Paweł Drobek <pawel.drobek@gmail.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7febe2be

drivers/usb/serial/option.c

+0 −5
Original line number Diff line number Diff line
@@ -311,10 +311,6 @@ static void option_instat_callback(struct urb *urb); 
#define ZTE_PRODUCT_AC2726			0xfff5

#define ZTE_PRODUCT_AC8710T			0xffff



/* ZTE PRODUCTS -- alternate vendor ID */

#define ZTE_VENDOR_ID2				0x1d6b

#define ZTE_PRODUCT_MF_330			0x0002



#define BENQ_VENDOR_ID				0x04a5

#define BENQ_PRODUCT_H10			0x4068
@@ -941,7 +937,6 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) },

	{ USB_DEVICE(ZTE_VENDOR_ID2, ZTE_PRODUCT_MF_330) },

	{ USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },

	{ USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },

	{ USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes, ALINK_VENDOR_ID */