diff options
| author | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2006-05-29 03:31:30 +0000 |
|---|---|---|
| committer | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2006-05-29 03:31:30 +0000 |
| commit | 28cdf6cf6449ae3bdac332f5aaac1a3b1dc8c98b (patch) | |
| tree | 45f137c3a1d32fb1e82e1fc21ba0cb8a951691c9 /sys/dev | |
| parent | 8bc78fef1de78c81ac3eaf4cda0111a241ff8b9e (diff) | |
Only do the software part of an abort if we are dying.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/ohci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 1a3b59216aa..96cf9528566 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.68 2006/05/22 15:52:48 krw Exp $ */ +/* $OpenBSD: ohci.c,v 1.69 2006/05/29 03:31:29 pascoe 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 $ */ @@ -2164,6 +2164,7 @@ ohci_abort_xfer(usbd_xfer_handle xfer, usbd_status status) usb_uncallout(xfer->timeout_handle, ohci_timeout, xfer); usb_transfer_complete(xfer); splx(s); + return; } if (xfer->device->bus->intr_context || !curproc) |