summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstsp <stsp@openbsd.org>2017-09-04 11:24:08 +0000
committerstsp <stsp@openbsd.org>2017-09-04 11:24:08 +0000
commit1ed020d5071af8d2f990518b451fd2409f282fe3 (patch)
tree91e67fd8a43a162ba76594f3fe2b851158302378
parentMove to current mouse position not last when clcking in copy mode; fixes (diff)
downloadwireguard-openbsd-1ed020d5071af8d2f990518b451fd2409f282fe3.tar.xz
wireguard-openbsd-1ed020d5071af8d2f990518b451fd2409f282fe3.zip
Revert previous: "Fix a remaining length miscalculation in xhci(4)."
It made one of my machines get stuck during boot.
-rw-r--r--sys/dev/usb/xhci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c
index 79e930c9159..450b1a43603 100644
--- a/sys/dev/usb/xhci.c
+++ b/sys/dev/usb/xhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xhci.c,v 1.75 2017/09/01 16:01:27 stsp Exp $ */
+/* $OpenBSD: xhci.c,v 1.76 2017/09/04 11:24:08 stsp Exp $ */
/*
* Copyright (c) 2014-2015 Martin Pieuchot
@@ -2571,7 +2571,7 @@ xhci_device_generic_start(struct usbd_xfer *xfer)
/* We'll do the first TRB once we're finished with the chain. */
trb0 = xhci_xfer_get_trb(sc, xfer, &toggle0, (ntrb == 1));
- remain = xfer->length;
+ remain = xfer->length - len0;
paddr += len0;
len = min(remain, XHCI_TRB_MAXSIZE);