aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/serial/option.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index f2280606b73c..75350fc550a1 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -268,6 +268,8 @@ static void option_instat_callback(struct urb *urb);
268#define TELIT_PRODUCT_CC864_SINGLE 0x1006 268#define TELIT_PRODUCT_CC864_SINGLE 0x1006
269#define TELIT_PRODUCT_DE910_DUAL 0x1010 269#define TELIT_PRODUCT_DE910_DUAL 0x1010
270#define TELIT_PRODUCT_UE910_V2 0x1012 270#define TELIT_PRODUCT_UE910_V2 0x1012
271#define TELIT_PRODUCT_LE922_USBCFG0 0x1042
272#define TELIT_PRODUCT_LE922_USBCFG3 0x1043
271#define TELIT_PRODUCT_LE920 0x1200 273#define TELIT_PRODUCT_LE920 0x1200
272#define TELIT_PRODUCT_LE910 0x1201 274#define TELIT_PRODUCT_LE910 0x1201
273 275
@@ -615,6 +617,16 @@ static const struct option_blacklist_info telit_le920_blacklist = {
615 .reserved = BIT(1) | BIT(5), 617 .reserved = BIT(1) | BIT(5),
616}; 618};
617 619
620static const struct option_blacklist_info telit_le922_blacklist_usbcfg0 = {
621 .sendsetup = BIT(2),
622 .reserved = BIT(0) | BIT(1) | BIT(3),
623};
624
625static const struct option_blacklist_info telit_le922_blacklist_usbcfg3 = {
626 .sendsetup = BIT(0),
627 .reserved = BIT(1) | BIT(2) | BIT(3),
628};
629
618static const struct usb_device_id option_ids[] = { 630static const struct usb_device_id option_ids[] = {
619 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, 631 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
620 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, 632 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -1160,6 +1172,10 @@ static const struct usb_device_id option_ids[] = {
1160 { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_SINGLE) }, 1172 { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_SINGLE) },
1161 { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) }, 1173 { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) },
1162 { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UE910_V2) }, 1174 { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UE910_V2) },
1175 { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG0),
1176 .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg0 },
1177 { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG3),
1178 .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },
1163 { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910), 1179 { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910),
1164 .driver_info = (kernel_ulong_t)&telit_le910_blacklist }, 1180 .driver_info = (kernel_ulong_t)&telit_le910_blacklist },
1165 { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920), 1181 { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920),