lkml.org 
[lkml]   [2007]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[2.6.20.21 review 13/35] USB: allow retry on descriptor fetch errors
    This patch (as964) was suggested by Steffen Koepf.  It makes
    usb_get_descriptor() retry on all errors other than ETIMEDOUT, instead
    of only on EPIPE. This helps with some devices.

    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/usb/core/message.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    Index: 2.6/drivers/usb/core/message.c
    ===================================================================
    --- 2.6.orig/drivers/usb/core/message.c
    +++ 2.6/drivers/usb/core/message.c
    @@ -608,12 +608,12 @@ int usb_get_descriptor(struct usb_device
    memset(buf,0,size); // Make sure we parse really received data

    for (i = 0; i < 3; ++i) {
    - /* retry on length 0 or stall; some devices are flakey */
    + /* retry on length 0 or error; some devices are flakey */
    result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
    USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,
    (type << 8) + index, 0, buf, size,
    USB_CTRL_GET_TIMEOUT);
    - if (result == 0 || result == -EPIPE)
    + if (result <= 0 && result != -ETIMEDOUT)
    continue;
    if (result > 1 && ((u8 *)buf)[1] != type) {
    result = -EPROTO;
    --
    -
    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-10-13 16:47    [W:3.940 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site