lkml.org 
[lkml]   [2012]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 56/69] USB: option: add more YUGA device ids
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: 说不得 <gavin.kx@qq.com>

    commit 0ef0be15fd2564767f114c249fc4af704d8e16f4 upstream.

    Signed-off-by: gavin zhu <gavin.zhu@qq.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/serial/option.c | 44 ++++++++++++++++++++++++++-----------------
    1 file changed, 27 insertions(+), 17 deletions(-)

    diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
    index d12ee2f..e668a24 100644
    --- a/drivers/usb/serial/option.c
    +++ b/drivers/usb/serial/option.c
    @@ -427,7 +427,7 @@ static void option_instat_callback(struct urb *urb);
    #define SAMSUNG_VENDOR_ID 0x04e8
    #define SAMSUNG_PRODUCT_GT_B3730 0x6889

    -/* YUGA products www.yuga-info.com*/
    +/* YUGA products www.yuga-info.com gavin.kx@qq.com */
    #define YUGA_VENDOR_ID 0x257A
    #define YUGA_PRODUCT_CEM600 0x1601
    #define YUGA_PRODUCT_CEM610 0x1602
    @@ -444,6 +444,8 @@ static void option_instat_callback(struct urb *urb);
    #define YUGA_PRODUCT_CEU516 0x160C
    #define YUGA_PRODUCT_CEU528 0x160D
    #define YUGA_PRODUCT_CEU526 0x160F
    +#define YUGA_PRODUCT_CEU881 0x161F
    +#define YUGA_PRODUCT_CEU882 0x162F

    #define YUGA_PRODUCT_CWM600 0x2601
    #define YUGA_PRODUCT_CWM610 0x2602
    @@ -459,23 +461,26 @@ static void option_instat_callback(struct urb *urb);
    #define YUGA_PRODUCT_CWU518 0x260B
    #define YUGA_PRODUCT_CWU516 0x260C
    #define YUGA_PRODUCT_CWU528 0x260D
    +#define YUGA_PRODUCT_CWU581 0x260E
    #define YUGA_PRODUCT_CWU526 0x260F
    -
    -#define YUGA_PRODUCT_CLM600 0x2601
    -#define YUGA_PRODUCT_CLM610 0x2602
    -#define YUGA_PRODUCT_CLM500 0x2603
    -#define YUGA_PRODUCT_CLM510 0x2604
    -#define YUGA_PRODUCT_CLM800 0x2605
    -#define YUGA_PRODUCT_CLM900 0x2606
    -
    -#define YUGA_PRODUCT_CLU718 0x2607
    -#define YUGA_PRODUCT_CLU716 0x2608
    -#define YUGA_PRODUCT_CLU728 0x2609
    -#define YUGA_PRODUCT_CLU726 0x260A
    -#define YUGA_PRODUCT_CLU518 0x260B
    -#define YUGA_PRODUCT_CLU516 0x260C
    -#define YUGA_PRODUCT_CLU528 0x260D
    -#define YUGA_PRODUCT_CLU526 0x260F
    +#define YUGA_PRODUCT_CWU582 0x261F
    +#define YUGA_PRODUCT_CWU583 0x262F
    +
    +#define YUGA_PRODUCT_CLM600 0x3601
    +#define YUGA_PRODUCT_CLM610 0x3602
    +#define YUGA_PRODUCT_CLM500 0x3603
    +#define YUGA_PRODUCT_CLM510 0x3604
    +#define YUGA_PRODUCT_CLM800 0x3605
    +#define YUGA_PRODUCT_CLM900 0x3606
    +
    +#define YUGA_PRODUCT_CLU718 0x3607
    +#define YUGA_PRODUCT_CLU716 0x3608
    +#define YUGA_PRODUCT_CLU728 0x3609
    +#define YUGA_PRODUCT_CLU726 0x360A
    +#define YUGA_PRODUCT_CLU518 0x360B
    +#define YUGA_PRODUCT_CLU516 0x360C
    +#define YUGA_PRODUCT_CLU528 0x360D
    +#define YUGA_PRODUCT_CLU526 0x360F

    /* Viettel products */
    #define VIETTEL_VENDOR_ID 0x2262
    @@ -1216,6 +1221,11 @@ static const struct usb_device_id option_ids[] = {
    { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU516) },
    { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU528) },
    { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU526) },
    + { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEU881) },
    + { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEU882) },
    + { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CWU581) },
    + { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CWU582) },
    + { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CWU583) },
    { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) },
    { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 0xff, 0xff, 0xff) },
    { USB_DEVICE(LG_VENDOR_ID, LG_PRODUCT_L02C) }, /* docomo L-02C modem */

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-06-17 21:02    [W:0.028 / U:92.376 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site