aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/option.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index b8da93b3615c..d59e37571d99 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -316,6 +316,9 @@ static void option_instat_callback(struct urb *urb);
316#define ZTE_PRODUCT_AC8710 0xfff1 316#define ZTE_PRODUCT_AC8710 0xfff1
317#define ZTE_PRODUCT_AC2726 0xfff5 317#define ZTE_PRODUCT_AC2726 0xfff5
318#define ZTE_PRODUCT_AC8710T 0xffff 318#define ZTE_PRODUCT_AC8710T 0xffff
319#define ZTE_PRODUCT_MC2718 0xffe8
320#define ZTE_PRODUCT_AD3812 0xffeb
321#define ZTE_PRODUCT_MC2716 0xffed
319 322
320#define BENQ_VENDOR_ID 0x04a5 323#define BENQ_VENDOR_ID 0x04a5
321#define BENQ_PRODUCT_H10 0x4068 324#define BENQ_PRODUCT_H10 0x4068
@@ -504,6 +507,18 @@ static const struct option_blacklist_info zte_k3765_z_blacklist = {
504 .reserved = BIT(4), 507 .reserved = BIT(4),
505}; 508};
506 509
510static const struct option_blacklist_info zte_ad3812_z_blacklist = {
511 .sendsetup = BIT(0) | BIT(1) | BIT(2),
512};
513
514static const struct option_blacklist_info zte_mc2718_z_blacklist = {
515 .sendsetup = BIT(1) | BIT(2) | BIT(3) | BIT(4),
516};
517
518static const struct option_blacklist_info zte_mc2716_z_blacklist = {
519 .sendsetup = BIT(1) | BIT(2) | BIT(3),
520};
521
507static const struct option_blacklist_info huawei_cdc12_blacklist = { 522static const struct option_blacklist_info huawei_cdc12_blacklist = {
508 .reserved = BIT(1) | BIT(2), 523 .reserved = BIT(1) | BIT(2),
509}; 524};
@@ -1047,6 +1062,12 @@ static const struct usb_device_id option_ids[] = {
1047 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) }, 1062 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) },
1048 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) }, 1063 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
1049 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) }, 1064 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) },
1065 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2718, 0xff, 0xff, 0xff),
1066 .driver_info = (kernel_ulong_t)&zte_mc2718_z_blacklist },
1067 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AD3812, 0xff, 0xff, 0xff),
1068 .driver_info = (kernel_ulong_t)&zte_ad3812_z_blacklist },
1069 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2716, 0xff, 0xff, 0xff),
1070 .driver_info = (kernel_ulong_t)&zte_mc2716_z_blacklist },
1050 { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) }, 1071 { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
1051 { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) }, 1072 { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
1052 { USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes, ALINK_VENDOR_ID */ 1073 { USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes, ALINK_VENDOR_ID */