[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / 3.2.21 / 0050-USB-option-Updated-Huawei-K4605-has-better-id.patch
1 From 547f4fcdd71718e4522557b1d9210d11ef00d17e Mon Sep 17 00:00:00 2001
2 From: Andrew Bird <ajb@spheresystems.co.uk>
3 Date: Mon, 28 May 2012 12:43:06 +0100
4 Subject: [PATCH 50/67] USB: option: Updated Huawei K4605 has better id
6 commit 42ca7da1c2363dbef4ba1b6917c4c02274b6a5e2 upstream.
8 Later firmwares for this device now have proper subclass and
9 protocol info so we can identify it nicely without needing to use
10 the blacklist. I'm not removing the old 0xff matching as there
11 may be devices in the field that still need that.
13 Signed-off-by: Andrew Bird <ajb@spheresystems.co.uk>
14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
15 [bwh: Backported to 3.2: adjust context]
16 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
17 ---
18 drivers/usb/serial/option.c | 2 ++
19 1 file changed, 2 insertions(+)
21 diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
22 index cbe3451..ef57b1e 100644
23 --- a/drivers/usb/serial/option.c
24 +++ b/drivers/usb/serial/option.c
25 @@ -666,6 +666,8 @@ static const struct usb_device_id option_ids[] = {
26 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3806, 0xff, 0xff, 0xff) },
27 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff),
28 .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
29 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0x01, 0x31) },
30 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0x01, 0x32) },
31 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x31) },
32 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x32) },
33 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x31) },
34 --
35 1.7.9.5