lkml.org 
[lkml]   [2011]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[112/165] Bind only modem AT command endpoint to option module.
    2.6.39-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    Content-Length: 1770
    Lines: 40

    From: "Marius B. Kotsbak" <marius@kotsbak.com>

    commit 15b2f3204a5c878c32939094775fb7349f707263 upstream.

    Network interface is handled by upcoming gt_b3730 module.

    Removed "GT-B3710" from comment, it is another modem with another USB ID.

    Signed-off-by: Marius B. Kotsbak <marius@kotsbak.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/usb/serial/option.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    --- a/drivers/usb/serial/option.c
    +++ b/drivers/usb/serial/option.c
    @@ -972,7 +972,7 @@ static const struct usb_device_id option
    { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
    { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
    { USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */
    - { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730/GT-B3710 LTE USB 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.*/
    { } /* Terminating entry */
    };
    MODULE_DEVICE_TABLE(usb, option_ids);
    @@ -1109,6 +1109,12 @@ static int option_probe(struct usb_seria
    serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)
    return -ENODEV;

    + /* Don't bind network interface on Samsung GT-B3730, it is handled by a separate module */
    + if (serial->dev->descriptor.idVendor == SAMSUNG_VENDOR_ID &&
    + serial->dev->descriptor.idProduct == SAMSUNG_PRODUCT_GT_B3730 &&
    + serial->interface->cur_altsetting->desc.bInterfaceClass != USB_CLASS_CDC_DATA)
    + return -ENODEV;
    +
    data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL);

    if (!data)



    \
     
     \ /
      Last update: 2011-06-01 10:43    [W:0.020 / U:3.764 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site