diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2012-03-16 15:41:26 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-16 13:30:11 -0700 |
| commit | 5889d3d4209c1050b4a3c96c41faf6c0976a4acf (patch) | |
| tree | d4e1be201b5c9869365115c2c7260884265b7a2b /drivers | |
| parent | usb: gadget: f_fs: Remove lock is held before freeing checks (diff) | |
| download | linux-dev-5889d3d4209c1050b4a3c96c41faf6c0976a4acf.tar.xz linux-dev-5889d3d4209c1050b4a3c96c41faf6c0976a4acf.zip | |
USB: option: add ZTE MF820D
This device presents a total of 5 interfaces with ff/ff/ff
class/subclass/protocol. The last one of these is verified
to be a QMI/wwan combined interface which should be handled
by the qmi_wwan driver, so we blacklist it here.
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/serial/option.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 88447eb523c0..6815701cf656 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -901,6 +901,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0162, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0164, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0165, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0167, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff) }, |