aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/serial/option.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 85e5fc08bba6..51b0beb39280 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -359,6 +359,13 @@ struct option_blacklist_info {
359 enum option_blacklist_reason reason; 359 enum option_blacklist_reason reason;
360}; 360};
361 361
362static const u8 four_g_w14_no_sendsetup[] = { 0, 1 };
363static const struct option_blacklist_info four_g_w14_blacklist = {
364 .infolen = ARRAY_SIZE(four_g_w14_no_sendsetup),
365 .ifaceinfo = four_g_w14_no_sendsetup,
366 .reason = OPTION_BLACKLIST_SENDSETUP
367};
368
362static const struct usb_device_id option_ids[] = { 369static const struct usb_device_id option_ids[] = {
363 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, 370 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
364 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, 371 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -659,7 +666,9 @@ static const struct usb_device_id option_ids[] = {
659 { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) }, 666 { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) },
660 { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) }, 667 { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
661 { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) }, 668 { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
662 { USB_DEVICE(FOUR_G_SYSTEMS_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14) }, 669 { USB_DEVICE(FOUR_G_SYSTEMS_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
670 .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
671 },
663 { USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) }, 672 { USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
664 { } /* Terminating entry */ 673 { } /* Terminating entry */
665}; 674};