CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Sun Feb 21 07:04:14 UTC 2016

Modified Files:
        src/sys/dev/usb [nick-nhusb]: ehci.c

Log Message:
We need to delete the transfer from the interrupt list in
ehci_abort_isoc_xfer


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.87 -r1.234.2.88 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.87 src/sys/dev/usb/ehci.c:1.234.2.88
--- src/sys/dev/usb/ehci.c:1.234.2.87	Fri Feb 19 16:23:15 2016
+++ src/sys/dev/usb/ehci.c	Sun Feb 21 07:04:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.234.2.87 2016/02/19 16:23:15 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.234.2.88 2016/02/21 07:04:13 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.87 2016/02/19 16:23:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.88 2016/02/21 07:04:13 skrll Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -3425,6 +3425,7 @@ ehci_abort_isoc_xfer(struct usbd_xfer *x
 
 	xfer->ux_status = status;
 	callout_stop(&xfer->ux_callout);
+	ehci_del_intr_list(sc, exfer);
 
 	if (xfer->ux_pipe->up_dev->ud_speed == USB_SPEED_HIGH) {
 		for (itd = exfer->ex_itdstart; itd != NULL;