From: Andrew Bird Date: Mon, 28 May 2012 11:43:06 +0000 (+0100) Subject: UPSTREAM: USB: option: Updated Huawei K4605 has better id X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=5d27dca835fbdd8b65770b2b3317e50340f072f8 UPSTREAM: USB: option: Updated Huawei K4605 has better id Later firmwares for this device now have proper subclass and protocol info so we can identify it nicely without needing to use the blacklist. I'm not removing the old 0xff matching as there may be devices in the field that still need that. Signed-off-by: Andrew Bird Cc: stable Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 42ca7da1c2363dbef4ba1b6917c4c02274b6a5e2) Change-Id: I9baea88b9f9d3fb1de84a296f3fe1765b5f2f110 Signed-off-by: Ben Chan Reviewed-on: https://gerrit.chromium.org/gerrit/50560 Reviewed-by: Olof Johansson --- diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 048c6d3f8e31..59ac2d076cbe 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -670,6 +670,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3806, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0x01, 0x31) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0x01, 0x32) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K5005, 0xff, 0x01, 0x31) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K5005, 0xff, 0x01, 0x32) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K5005, 0xff, 0x01, 0x33) },