lkml.org 
[lkml]   [2016]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 184/346] cdc-acm: fix wrong pipe type on rx interrupt xfers
    3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Gavin Li <git@thegavinli.com>

    commit add125054b8727103631dce116361668436ef6a7 upstream.

    This fixes the "BOGUS urb xfer" warning logged by usb_submit_urb().

    Signed-off-by: Gavin Li <git@thegavinli.com>
    Acked-by: Oliver Neukum <oneukum@suse.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/class/cdc-acm.c | 5 ++---
    drivers/usb/class/cdc-acm.h | 1 -
    2 files changed, 2 insertions(+), 4 deletions(-)

    --- a/drivers/usb/class/cdc-acm.c
    +++ b/drivers/usb/class/cdc-acm.c
    @@ -1336,7 +1336,6 @@ made_compressed_probe:
    spin_lock_init(&acm->write_lock);
    spin_lock_init(&acm->read_lock);
    mutex_init(&acm->mutex);
    - acm->rx_endpoint = usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress);
    acm->is_int_ep = usb_endpoint_xfer_int(epread);
    if (acm->is_int_ep)
    acm->bInterval = epread->bInterval;
    @@ -1386,14 +1385,14 @@ made_compressed_probe:
    urb->transfer_dma = rb->dma;
    if (acm->is_int_ep) {
    usb_fill_int_urb(urb, acm->dev,
    - acm->rx_endpoint,
    + usb_rcvintpipe(usb_dev, epread->bEndpointAddress),
    rb->base,
    acm->readsize,
    acm_read_bulk_callback, rb,
    acm->bInterval);
    } else {
    usb_fill_bulk_urb(urb, acm->dev,
    - acm->rx_endpoint,
    + usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress),
    rb->base,
    acm->readsize,
    acm_read_bulk_callback, rb);
    --- a/drivers/usb/class/cdc-acm.h
    +++ b/drivers/usb/class/cdc-acm.h
    @@ -95,7 +95,6 @@ struct acm {
    struct urb *read_urbs[ACM_NR];
    struct acm_rb read_buffers[ACM_NR];
    int rx_buflimit;
    - int rx_endpoint;
    spinlock_t read_lock;
    int write_used; /* number of non-empty write buffers */
    int transmitting;
    \
     
     \ /
      Last update: 2016-11-14 03:09    [W:7.388 / U:0.688 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site