| From c638eb2872b3af079501e7ee44cbb8a5cce9b4b5 Mon Sep 17 00:00:00 2001 |
| From: Bjørn Mork <bjorn@mork.no> |
| Date: Wed, 19 Sep 2012 22:02:03 +0200 |
| Subject: USB: qcaux: add Pantech vendor class match |
| |
| From: Bjørn Mork <bjorn@mork.no> |
| |
| commit c638eb2872b3af079501e7ee44cbb8a5cce9b4b5 upstream. |
| |
| The three Pantech devices UML190 (106c:3716), UML290 (106c:3718) and |
| P4200 (106c:3721) all use the same subclasses to identify vendor |
| specific functions. Replace the existing device specific entries |
| with generic vendor matching, adding support for the P4200. |
| |
| Signed-off-by: Bjørn Mork <bjorn@mork.no> |
| Cc: Thomas Schäfer <tschaefer@t-online.de> |
| Acked-by: Dan Williams <dcbw@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/serial/qcaux.c | 10 +++------- |
| 1 file changed, 3 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/usb/serial/qcaux.c |
| +++ b/drivers/usb/serial/qcaux.c |
| @@ -36,8 +36,6 @@ |
| #define UTSTARCOM_PRODUCT_UM175_V1 0x3712 |
| #define UTSTARCOM_PRODUCT_UM175_V2 0x3714 |
| #define UTSTARCOM_PRODUCT_UM175_ALLTEL 0x3715 |
| -#define PANTECH_PRODUCT_UML190_VZW 0x3716 |
| -#define PANTECH_PRODUCT_UML290_VZW 0x3718 |
| |
| /* CMOTECH devices */ |
| #define CMOTECH_VENDOR_ID 0x16d8 |
| @@ -68,11 +66,9 @@ static struct usb_device_id id_table[] = |
| { USB_DEVICE_AND_INTERFACE_INFO(LG_VENDOR_ID, LG_PRODUCT_VX4400_6000, 0xff, 0xff, 0x00) }, |
| { USB_DEVICE_AND_INTERFACE_INFO(SANYO_VENDOR_ID, SANYO_PRODUCT_KATANA_LX, 0xff, 0xff, 0x00) }, |
| { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_U520, 0xff, 0x00, 0x00) }, |
| - { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML190_VZW, 0xff, 0xff, 0xff) }, |
| - { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML190_VZW, 0xff, 0xfe, 0xff) }, |
| - { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xfd, 0xff) }, /* NMEA */ |
| - { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xfe, 0xff) }, /* WMC */ |
| - { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xff, 0xff) }, /* DIAG */ |
| + { USB_VENDOR_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, 0xff, 0xfd, 0xff) }, /* NMEA */ |
| + { USB_VENDOR_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, 0xff, 0xfe, 0xff) }, /* WMC */ |
| + { USB_VENDOR_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, 0xff, 0xff, 0xff) }, /* DIAG */ |
| { }, |
| }; |
| MODULE_DEVICE_TABLE(usb, id_table); |