diff options
author | Dan Williams <dcbw@redhat.com> | 2011-09-13 14:51:45 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-18 04:23:22 -0400 |
commit | eb05ce567a81c592c58f4bdb96eb91ce96661c30 (patch) | |
tree | c67dfa6607ed2bd577e855138c9101e6fdca750e | |
parent | 0d905fd5ece4ab65e8407c450077744e1c8f661b (diff) |
USB: option: add ZTE product 0x0037 to sendsetup blacklist
Signed-off-by: Dan Williams <dcbw@redhat.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/serial/option.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index fc9e874a7681..7a336f7089ac 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
@@ -491,6 +491,10 @@ static const struct option_blacklist_info alcatel_x200_blacklist = { | |||
491 | .sendsetup = BIT(0) | BIT(1), | 491 | .sendsetup = BIT(0) | BIT(1), |
492 | }; | 492 | }; |
493 | 493 | ||
494 | static const struct option_blacklist_info zte_0037_blacklist = { | ||
495 | .sendsetup = BIT(0) | BIT(1), | ||
496 | }; | ||
497 | |||
494 | static const struct option_blacklist_info zte_k3765_z_blacklist = { | 498 | static const struct option_blacklist_info zte_k3765_z_blacklist = { |
495 | .sendsetup = BIT(0) | BIT(1) | BIT(2), | 499 | .sendsetup = BIT(0) | BIT(1) | BIT(2), |
496 | }; | 500 | }; |
@@ -743,7 +747,8 @@ static const struct usb_device_id option_ids[] = { | |||
743 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) }, | 747 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) }, |
744 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) }, | 748 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) }, |
745 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0034, 0xff, 0xff, 0xff) }, | 749 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0034, 0xff, 0xff, 0xff) }, |
746 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff) }, | 750 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff), |
751 | .driver_info = (kernel_ulong_t)&zte_0037_blacklist }, | ||
747 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0038, 0xff, 0xff, 0xff) }, | 752 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0038, 0xff, 0xff, 0xff) }, |
748 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0039, 0xff, 0xff, 0xff) }, | 753 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0039, 0xff, 0xff, 0xff) }, |
749 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0040, 0xff, 0xff, 0xff) }, | 754 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0040, 0xff, 0xff, 0xff) }, |