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

Commit 46b5a277 authored by zheng.zhijian@zte.com.cn's avatar zheng.zhijian@zte.com.cn Committed by Greg Kroah-Hartman
Browse files

USB: option: release new PID for ZTE 3G modem 



This patch adds new PIDs for ZTE 3G modem, after we confirm it and tested.
Thanks for Dan's work at kernel option devier.

Signed-off-by: default avatarAlvin.Zheng <zheng.zhijian@zte.com.cn>
Signed-off-by: default avatarwsalvin <wsalvin@yahoo.com.cn>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e253dec3

drivers/usb/serial/option.c

+21 −0
Original line number Diff line number Diff line
@@ -316,6 +316,9 @@ static void option_instat_callback(struct urb *urb); 
#define ZTE_PRODUCT_AC8710			0xfff1

#define ZTE_PRODUCT_AC2726			0xfff5

#define ZTE_PRODUCT_AC8710T			0xffff

#define ZTE_PRODUCT_MC2718			0xffe8

#define ZTE_PRODUCT_AD3812			0xffeb

#define ZTE_PRODUCT_MC2716			0xffed



#define BENQ_VENDOR_ID				0x04a5

#define BENQ_PRODUCT_H10			0x4068
@@ -504,6 +507,18 @@ static const struct option_blacklist_info zte_k3765_z_blacklist = { 
	.reserved = BIT(4),

};



static const struct option_blacklist_info zte_ad3812_z_blacklist = {

	.sendsetup = BIT(0) | BIT(1) | BIT(2),

};



static const struct option_blacklist_info zte_mc2718_z_blacklist = {

	.sendsetup = BIT(1) | BIT(2) | BIT(3) | BIT(4),

};



static const struct option_blacklist_info zte_mc2716_z_blacklist = {

	.sendsetup = BIT(1) | BIT(2) | BIT(3),

};



static const struct option_blacklist_info huawei_cdc12_blacklist = {

	.reserved = BIT(1) | BIT(2),

};
@@ -1047,6 +1062,12 @@ 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_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2718, 0xff, 0xff, 0xff),

	 .driver_info = (kernel_ulong_t)&zte_mc2718_z_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AD3812, 0xff, 0xff, 0xff),

	 .driver_info = (kernel_ulong_t)&zte_ad3812_z_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2716, 0xff, 0xff, 0xff),

	 .driver_info = (kernel_ulong_t)&zte_mc2716_z_blacklist },

	{ 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 */