lkml.org 
[lkml]   [2007]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 35/54] USB: set the correct Interrupt interval in usb_bulk_msg
    -stable review patch.  If anyone has any objections, please let us know.
    ---------------------

    From: Alan Stern <stern@rowland.harvard.edu>

    This patch (as902) fixes a mistake I introduced into usb_bulk_msg().
    usb_fill_int_urb() already does the bit-shifting calculation for
    high-speed Interrupt intervals; it shouldn't be done twice.

    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>

    ---
    drivers/usb/core/message.c | 9 ++-------
    1 file changed, 2 insertions(+), 7 deletions(-)

    --- linux-2.6.21.4.orig/drivers/usb/core/message.c
    +++ linux-2.6.21.4/drivers/usb/core/message.c
    @@ -221,15 +221,10 @@ int usb_bulk_msg(struct usb_device *usb_

    if ((ep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
    USB_ENDPOINT_XFER_INT) {
    - int interval;
    -
    - if (usb_dev->speed == USB_SPEED_HIGH)
    - interval = 1 << min(15, ep->desc.bInterval - 1);
    - else
    - interval = ep->desc.bInterval;
    pipe = (pipe & ~(3 << 30)) | (PIPE_INTERRUPT << 30);
    usb_fill_int_urb(urb, usb_dev, pipe, data, len,
    - usb_api_blocking_completion, NULL, interval);
    + usb_api_blocking_completion, NULL,
    + ep->desc.bInterval);
    } else
    usb_fill_bulk_urb(urb, usb_dev, pipe, data, len,
    usb_api_blocking_completion, NULL);
    --
    -
    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: 2007-06-08 09:51    [W:0.023 / U:3.816 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site