lkml.org 
[lkml]   [2014]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 067/170] usb: option: add/modify Olivetti Olicard modems
    Date
    From: Bjørn Mork <bjorn@mork.no>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit b0ebef36e93703e59003ad6a1a20227e47714417 upstream.

    Adding a couple of Olivetti modems and blacklisting the net
    function on a couple which are already supported.

    Reported-by: Lars Melin <larsm17@gmail.com>
    Signed-off-by: Bjørn Mork <bjorn@mork.no>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/usb/serial/option.c | 22 ++++++++++++++++------
    1 file changed, 16 insertions(+), 6 deletions(-)

    diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
    index 909bb77544b5..e25e8ca09fe2 100644
    --- a/drivers/usb/serial/option.c
    +++ b/drivers/usb/serial/option.c
    @@ -375,8 +375,12 @@ static void option_instat_callback(struct urb *urb);
    /* Olivetti products */
    #define OLIVETTI_VENDOR_ID 0x0b3c
    #define OLIVETTI_PRODUCT_OLICARD100 0xc000
    +#define OLIVETTI_PRODUCT_OLICARD120 0xc001
    +#define OLIVETTI_PRODUCT_OLICARD140 0xc002
    #define OLIVETTI_PRODUCT_OLICARD145 0xc003
    +#define OLIVETTI_PRODUCT_OLICARD155 0xc004
    #define OLIVETTI_PRODUCT_OLICARD200 0xc005
    +#define OLIVETTI_PRODUCT_OLICARD160 0xc00a
    #define OLIVETTI_PRODUCT_OLICARD500 0xc00b

    /* Celot products */
    @@ -1615,15 +1619,21 @@ static const struct usb_device_id option_ids[] = {
    { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDMNET) },
    { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */
    { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
    -
    - { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
    + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100),
    + .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
    + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120),
    + .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
    + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD140),
    + .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
    { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) },
    + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD155),
    + .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
    { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200),
    - .driver_info = (kernel_ulong_t)&net_intf6_blacklist
    - },
    + .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
    + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD160),
    + .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
    { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD500),
    - .driver_info = (kernel_ulong_t)&net_intf4_blacklist
    - },
    + .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
    { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
    { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/
    { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) },
    --
    2.0.0
    --
    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: 2014-07-19 10:41    [W:5.111 / U:0.476 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site