From: "shu.suo" <treeui....@gmail.com> Signed-off-by: shu.suo <treeui....@gmail.com> --- linux-3.14/drivers/usb/serial/option.c | 47 +++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 4 deletions(-)
diff --git a/linux-3.14/drivers/usb/serial/option.c b/linux-3.14/drivers/usb/serial/option.c index 68fc9fe..75337b2 100644 --- a/linux-3.14/drivers/usb/serial/option.c +++ b/linux-3.14/drivers/usb/serial/option.c @@ -285,7 +285,17 @@ static void option_instat_callback(struct urb *urb); #define ALCATEL_VENDOR_ID 0x1bbb #define ALCATEL_PRODUCT_X060S_X200 0x0000 #define ALCATEL_PRODUCT_X220_X500D 0x0017 -#define ALCATEL_PRODUCT_L100V 0x011e +#define ALCATEL_PRODUCT_0052 0x0052 +#define ALCATEL_PRODUCT_L100V 0x011e +#define ALCATEL_PRODUCT_00B6 0x00B6 +#define ALCATEL_PRODUCT_X600 0x00B7 +#define ALCATEL_PRODUCT_Y800_X715 0x0191 +#define ALCATEL_PRODUCT_0192 0x0192 +#define ALCATEL_PROCUCT_0194 0x0194 +#define ALCATEL_PRODUCT_01AA 0x01AA +#define ALCATEL_PRODUCT_0203 0x0203 +#define ALCATEL_PRODUCT_0204 0x0204 + #define PIRELLI_VENDOR_ID 0x1266 #define PIRELLI_PRODUCT_C100_1 0x1002 @@ -539,6 +549,23 @@ static const struct option_blacklist_info telit_le920_blacklist = { .reserved = BIT(1) | BIT(5), }; +static const struct option_blacklist_info net_adb_blacklist = { + .reserved = BIT(2) | BIT(3) | BIT(4), +}; + +static const struct option_blacklist_info net_adb1_blacklist = { + .reserved = BIT(0) | BIT(2), +}; + +static const struct option_blacklist_info net_adb2_blacklist = { + .reserved = BIT(2) | BIT(3), +}; + +static const struct option_blacklist_info net_intf0_blacklist = { + .reserved = BIT(0), +}; + + static const struct usb_device_id option_ids[] = { { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, @@ -1490,14 +1517,26 @@ static const struct usb_device_id option_ids[] = { }, { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D), .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, - { USB_DEVICE(ALCATEL_VENDOR_ID, 0x0052), + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_0052), .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, - { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b6), + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_00B6), .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, - { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b7), + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X600), .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_Y800_X715), + .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_0192), + .driver_info = (kernel_ulong_t)&net_adb_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PROCUCT_0194), + .driver_info = (kernel_ulong_t)&net_adb1_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_01AA), + .driver_info = (kernel_ulong_t)&net_intf0_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_0203), + .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_0204), + .driver_info = (kernel_ulong_t)&net_adb2_blacklist }, { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) }, { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) }, { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14), -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html