diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2004-09-11 03:33:41 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2004-09-11 03:33:41 +0000 |
| commit | 02a688e0818c2d4a0b5a42469d08f98ea877c205 (patch) | |
| tree | db06e017b151bad246b6c31b1a70ee6673c8b9cc /sys/dev/usb/ohci.c | |
| parent | d6a6d92a4b945604f1d6318e6ee5d5293939f0bc (diff) | |
backout 1.48, but maintain the fix for the merge error.
fixes hangs/crashes on detach of various devices.
found by jolan@, tested by drahn@ and jolan@, ok by deraadt@
Diffstat (limited to 'sys/dev/usb/ohci.c')
| -rw-r--r-- | sys/dev/usb/ohci.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 480ad720484..553d5698571 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.49 2004/08/11 04:18:34 dlg Exp $ */ +/* $OpenBSD: ohci.c,v 1.50 2004/09/11 03:33:40 dlg 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 $ */ @@ -1341,9 +1341,7 @@ ohci_softintr(void *v) /* Handled by abort routine. */ continue; } - - if (std->flags & OHCI_CALL_DONE) - usb_uncallout(xfer->timeout_handle, ohci_timeout, xfer); + usb_uncallout(xfer->timeout_handle, ohci_timeout, xfer); len = std->len; if (std->td.td_cbp != 0) |