diff options
author | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2006-05-29 03:15:06 +0000 |
---|---|---|
committer | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2006-05-29 03:15:06 +0000 |
commit | c64998faafdfeb0337257d9bac828c0c883417b4 (patch) | |
tree | 3aef481902472e19c683f2ce906c389263e837b8 /sys | |
parent | 6dd1665eb2eeed229abfaca60efca2b71079d62c (diff) |
Only do the software part of an abort if we are dying.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/usb/uhci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 51d37241129..c4b689c0a03 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.44 2006/05/22 20:35:12 krw Exp $ */ +/* $OpenBSD: uhci.c,v 1.45 2006/05/29 03:15:05 pascoe 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 $ */ @@ -1930,6 +1930,7 @@ uhci_abort_xfer(usbd_xfer_handle xfer, usbd_status status) usb_uncallout(xfer->timeout_handle, uhci_timeout, xfer); usb_transfer_complete(xfer); splx(s); + return; } if (xfer->device->bus->intr_context || !curproc) |