| From eb05ce567a81c592c58f4bdb96eb91ce96661c30 Mon Sep 17 00:00:00 2001 |
| From: Dan Williams <dcbw@redhat.com> |
| Date: Tue, 13 Sep 2011 13:51:45 -0500 |
| Subject: USB: option: add ZTE product 0x0037 to sendsetup blacklist |
| |
| From: Dan Williams <dcbw@redhat.com> |
| |
| commit eb05ce567a81c592c58f4bdb96eb91ce96661c30 upstream. |
| |
| Signed-off-by: Dan Williams <dcbw@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/usb/serial/option.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/usb/serial/option.c |
| +++ b/drivers/usb/serial/option.c |
| @@ -491,6 +491,10 @@ static const struct option_blacklist_inf |
| .sendsetup = BIT(0) | BIT(1), |
| }; |
| |
| +static const struct option_blacklist_info zte_0037_blacklist = { |
| + .sendsetup = BIT(0) | BIT(1), |
| +}; |
| + |
| static const struct option_blacklist_info zte_k3765_z_blacklist = { |
| .sendsetup = BIT(0) | BIT(1) | BIT(2), |
| }; |
| @@ -743,7 +747,8 @@ static const struct usb_device_id option |
| { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) }, |
| { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) }, |
| { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0034, 0xff, 0xff, 0xff) }, |
| - { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff) }, |
| + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff), |
| + .driver_info = (kernel_ulong_t)&zte_0037_blacklist }, |
| { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0038, 0xff, 0xff, 0xff) }, |
| { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0039, 0xff, 0xff, 0xff) }, |
| { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0040, 0xff, 0xff, 0xff) }, |
