From d5b41c23481e28ab1631e9d32c0485c516f089cc Mon Sep 17 00:00:00 2001
From: Josef Karthauser <joe@FreeBSD.org>
Date: Sun, 7 Apr 2002 18:13:16 +0000
Subject: MFNetBSD:     revision 1.155     date: 2002/02/27 12:42:41;  author:
 augustss;  state: Exp;  lines: +8 -8     Move the interrupt bailout when a
 cancelled ii is found.

---
 sys/dev/usb/uhci.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'sys/dev/usb')

diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 5d68f1891ea6c..66688bf2efaef 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhci.c,v 1.154 2002/02/27 12:12:45 augustss Exp $	*/
+/*	$NetBSD: uhci.c,v 1.155 2002/02/27 12:42:41 augustss Exp $	*/
 /*	$FreeBSD$	*/
 
 /*
@@ -1301,6 +1301,12 @@ uhci_check_intr(uhci_softc_t *sc, uhci_intr_info_t *ii)
 		return;
 	}
 #endif
+	if (ii->xfer->status == USBD_CANCELLED ||
+	    ii->xfer->status == USBD_TIMEOUT) {
+		DPRINTF(("uhci_check_intr: aborted xfer=%p\n", ii->xfer));
+		return;
+	}
+
 	if (ii->stdstart == NULL)
 		return;
 	lstd = ii->stdend;
@@ -1369,13 +1375,6 @@ uhci_idone(uhci_intr_info_t *ii)
 		splx(s);
 	}
 #endif
-
-	if (xfer->status == USBD_CANCELLED ||
-	    xfer->status == USBD_TIMEOUT) {
-		DPRINTF(("uhci_idone: aborted xfer=%p\n", xfer));
-		return;
-	}
-
 	if (xfer->nframes != 0) {
 		/* Isoc transfer, do things differently. */
 		uhci_soft_td_t **stds = upipe->u.iso.stds;
-- 
cgit v1.3