Please merge.

- Dave
This patch stops changing the reported fault mode in cases where retries of
GET_DESCRIPTOR fail because the device just doesn't have such a descriptor.
Plus, it stops printing messages when retrying.

It also reduces the number of retries; the first retry seems to resolve most
of these firmware problems.

Signed-Off-By:  David Brownell <[EMAIL PROTECTED]>


--- 1.55/drivers/usb/core/message.c     Fri May 14 17:25:51 2004
+++ edited/drivers/usb/core/message.c   Tue Jun  1 15:10:37 2004
@@ -566,7 +566,7 @@
  */
 int usb_get_descriptor(struct usb_device *dev, unsigned char type, unsigned char 
index, void *buf, int size)
 {
-       int i = 5;
+       int i = 3;
        int result;
        
        memset(buf,0,size);     // Make sure we parse really received data
@@ -579,9 +579,6 @@
                                    HZ * USB_CTRL_GET_TIMEOUT)) > 0
                                || result != -EPIPE)
                        break;
-
-               dev_dbg (&dev->dev, "RETRY descriptor, result %d\n", result);
-               result = -ENOMSG;
        }
        return result;
 }

Reply via email to