diff options
| author | joe <joe@FreeBSD.org> | 2002-04-07 18:13:16 +0000 |
|---|---|---|
| committer | joe <joe@FreeBSD.org> | 2002-04-07 18:13:16 +0000 |
| commit | 3f2a7b22304734daf51f870715683592c04ac5b5 (patch) | |
| tree | 7e100f88a8a5e78923e48c446c774cd7fadd3cc2 /sys/dev/usb | |
| parent | 28fb292a9bbd2e6b410e44d1235e6c54f5c1b1e4 (diff) | |
| download | FreeBSD-src-3f2a7b22304734daf51f870715683592c04ac5b5.zip FreeBSD-src-3f2a7b22304734daf51f870715683592c04ac5b5.tar.gz | |
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.
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/uhci.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 5d68f18..66688bf 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; |
