diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/ehci.c | 9 | ||||
| -rw-r--r-- | sys/dev/usb/ohci.c | 9 | ||||
| -rw-r--r-- | sys/dev/usb/uhci.c | 10 |
3 files changed, 9 insertions, 19 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index ef8e56473f3..e6e5dbdc224 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.148 2014/04/29 12:45:29 mpi Exp $ */ +/* $OpenBSD: ehci.c,v 1.149 2014/04/29 14:11:23 mpi Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -3448,11 +3448,8 @@ ehci_device_intr_start(struct usbd_xfer *xfer) void ehci_device_intr_abort(struct usbd_xfer *xfer) { - DPRINTFN(1, ("ehci_device_intr_abort: xfer=%p\n", xfer)); - if (xfer->pipe->intrxfer == xfer) { - DPRINTFN(1, ("ehci_device_intr_abort: remove\n")); - xfer->pipe->intrxfer = NULL; - } + KASSERT(xfer->pipe->intrxfer == xfer); + /* * XXX - abort_xfer uses ehci_sync_hc, which syncs via the advance * async doorbell. That's dependant on the async list, wheras diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index dc30c41744f..8571ee60c6d 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.125 2014/04/27 14:48:10 mpi Exp $ */ +/* $OpenBSD: ohci.c,v 1.126 2014/04/29 14:11:23 mpi Exp $ */ /* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ @@ -2973,14 +2973,11 @@ ohci_device_intr_start(struct usbd_xfer *xfer) return (USBD_IN_PROGRESS); } -/* Abort a device control request. */ void ohci_device_intr_abort(struct usbd_xfer *xfer) { - if (xfer->pipe->intrxfer == xfer) { - DPRINTF(("ohci_device_intr_abort: remove\n")); - xfer->pipe->intrxfer = NULL; - } + KASSERT(xfer->pipe->intrxfer == xfer); + ohci_abort_xfer(xfer, USBD_CANCELLED); } diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index cc3e930f1bb..ebbcaf9ab5d 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.111 2014/04/27 14:48:10 mpi Exp $ */ +/* $OpenBSD: uhci.c,v 1.112 2014/04/29 14:11:23 mpi Exp $ */ /* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -2011,15 +2011,11 @@ uhci_device_ctrl_close(struct usbd_pipe *pipe) { } -/* Abort a device interrupt request. */ void uhci_device_intr_abort(struct usbd_xfer *xfer) { - DPRINTFN(1,("uhci_device_intr_abort: xfer=%p\n", xfer)); - if (xfer->pipe->intrxfer == xfer) { - DPRINTFN(1,("uhci_device_intr_abort: remove\n")); - xfer->pipe->intrxfer = NULL; - } + KASSERT(xfer->pipe->intrxfer == xfer); + uhci_abort_xfer(xfer, USBD_CANCELLED); } |