From: mglocker <mglocker@openbsd.org>
Date: Sun, 1 May 2022 10:28:54 +0000 (+0000)
Subject: Check for the correct length field when checking the control transfer data
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e67124662443fa079554236b9b8307be38675cdd;p=openbsd

Check for the correct length field when checking the control transfer data
length.  Remove obsolete comment while here.

ok kettenis@
---

diff --git a/sys/dev/usb/dwc2/dwc2.c b/sys/dev/usb/dwc2/dwc2.c
index 3ec8a3e767d..ea2317e4754 100644
--- a/sys/dev/usb/dwc2/dwc2.c
+++ b/sys/dev/usb/dwc2/dwc2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2.c,v 1.60 2022/04/12 19:41:11 naddy Exp $	*/
+/*	$OpenBSD: dwc2.c,v 1.61 2022/05/01 10:28:54 mglocker Exp $	*/
 /*	$NetBSD: dwc2.c,v 1.32 2014/09/02 23:26:20 macallan Exp $	*/
 
 /*-
@@ -1365,9 +1365,7 @@ dwc2_device_start(struct usbd_xfer *xfer)
 				dwc2_hcd_get_ep_bandwidth(hsotg, dpipe),
 				xfer);
 	}
-
 	mtx_leave(&hsotg->lock);
-// 	mtx_exit(&sc->sc_lock);
 
 	return USBD_IN_PROGRESS;
 
@@ -1705,7 +1703,7 @@ void dwc2_host_complete(struct dwc2_hsotg *hsotg, struct dwc2_qtd *qtd,
 		 * everything else does.
 		 */
 		if (!(xfertype == UE_CONTROL &&
-		    xfer->length == 0) &&
+		    UGETW(xfer->request.wLength) == 0) &&
 		    xfer->actlen > 0 /* XXX PR/53503 */
 		    ) {
 			int rd = usbd_xfer_isread(xfer);