svn commit: r365964 - stable/12/sys/dev/usb

[Hans Petter Selasky]

Author: hselasky
Date: Mon Sep 21 18:27:44 2020
New Revision: 365964
URL: https://svnweb.freebsd.org/changeset/base/365964

Log:
  MFC r364932:
  Allow slow USB devices to be given more time to return their USB descriptors,
  like Logitech HD Pro Webcam C920.
  
  PR:		248926
  Sponsored by:	Mellanox Technologies

Modified:
  stable/12/sys/dev/usb/usb_request.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/usb/usb_request.c
==============================================================================
--- stable/12/sys/dev/usb/usb_request.c	Mon Sep 21 18:24:28 2020	(r365963)
+++ stable/12/sys/dev/usb/usb_request.c	Mon Sep 21 18:27:44 2020	(r365964)
@@ -721,7 +721,8 @@ done:
 	case USB_ERR_CANCELLED:
 		break;
 	default:
-		DPRINTF("I/O error - waiting a bit for TT cleanup\n");
+		DPRINTF("error=%s - waiting a bit for TT cleanup\n",
+		    usbd_errstr(err));
 		usb_pause_mtx(mtx, hz / 16);
 		break;
 	}
@@ -1010,7 +1011,7 @@ usbd_req_get_desc(struct usb_device *udev,
 		USETW(req.wLength, min_len);
 
 		err = usbd_do_request_flags(udev, mtx, &req,
-		    desc, 0, NULL, 500 /* ms */);
+		    desc, 0, NULL, 1000 /* ms */);
 
 		if (err != 0 && err != USB_ERR_TIMEOUT &&
 		    min_len != max_len) {
@@ -1021,7 +1022,7 @@ usbd_req_get_desc(struct usb_device *udev,
 			USETW(req.wLength, max_len);
 
 			err = usbd_do_request_flags(udev, mtx, &req,
-			    desc, USB_SHORT_XFER_OK, NULL, 500 /* ms */);
+			    desc, USB_SHORT_XFER_OK, NULL, 1000 /* ms */);
 
 			if (err == 0) {
 				/* verify length */