Module Name: src
Committed By: skrll
Date: Sat Feb 6 10:24:58 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c
Log Message:
Missed hunk from previous
To generate a diff of this commit:
cvs rdiff -u -r1.234.2.83 -r1.234.2.84 src/sys/dev/usb/ehci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.83 src/sys/dev/usb/ehci.c:1.234.2.84
--- src/sys/dev/usb/ehci.c:1.234.2.83 Sat Feb 6 10:21:45 2016
+++ src/sys/dev/usb/ehci.c Sat Feb 6 10:24:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.234.2.83 2016/02/06 10:21:45 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.234.2.84 2016/02/06 10:24:58 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.83 2016/02/06 10:21:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.84 2016/02/06 10:24:58 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -1268,12 +1268,10 @@ ehci_idone(struct ehci_xfer *ex, ex_comp
}
end:
- /*
- * XXX transfer_complete memcpys out transfer data (for in endpoints)
- * during this call, before methods->done is called: dma sync required
- * beforehand?
- */
- usb_transfer_complete(xfer);
+
+ ehci_del_intr_list(sc, ex);
+ TAILQ_INSERT_TAIL(cq, ex, ex_next);
+
USBHIST_LOG(ehcidebug, "ex=%p done", ex, 0, 0, 0);
}