From: Bjørn Mork Date: Wed, 15 Aug 2012 13:43:33 +0000 (+0200) Subject: UPSTREAM: USB: option: add ZTE K5006-Z X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=d53147cacfa050577b0ff0f97e413bf14dad1b8c UPSTREAM: USB: option: add ZTE K5006-Z The ZTE (Vodafone) K5006-Z use the following interface layout: 00 DIAG 01 secondary 02 modem 03 networkcard 04 storage Ignoring interface #3 which is handled by the qmi_wwan driver. Cc: Thomas Schäfer Cc: stable Signed-off-by: Bjørn Mork Signed-off-by: Greg Kroah-Hartman (cherry picked from commit f1b5c997e68533df1f96dcd3068a231bca495603) Change-Id: Iac1d47ba7798ed27a903eb5c7266b98134f5d27b Signed-off-by: Ben Chan Reviewed-on: https://gerrit.chromium.org/gerrit/50565 Reviewed-by: Olof Johansson --- diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 41d9b6c96f54..e3b9ff99a7a6 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -879,6 +879,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1018, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1057, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1058, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1059, 0xff, 0xff, 0xff) },