diff options
| author |   jakemsr <jakemsr@openbsd.org> | 2010-12-06 05:48:56 +0000 |
|---|---|---|
| committer | jakemsr <jakemsr@openbsd.org> | 2010-12-06 05:48:56 +0000 |
| commit | 606f97a1796c1fa431428e87f326d3e0c70aef7f (patch) | |
| tree | a2d93042c3a0c6b24cbf6ec239a19ccdf13e3d00 | |
| parent | a couple unchecked if_detach() in detach routines that were missed (diff) | |
| download | wireguard-openbsd-606f97a1796c1fa431428e87f326d3e0c70aef7f.tar.xz wireguard-openbsd-606f97a1796c1fa431428e87f326d3e0c70aef7f.zip | |
as in ehci and ohci, delete the interrupt timeout in the detach
routine
| -rw-r--r-- | sys/dev/usb/uhci.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index f8de2d13c7d..ff2ef3e00c1 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.86 2010/11/21 01:29:07 matthew Exp $ */ +/* $OpenBSD: uhci.c,v 1.87 2010/12/06 05:48:56 jakemsr 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 $ */ @@ -608,6 +608,11 @@ uhci_detach(struct uhci_softc *sc, int flags) if (sc->sc_shutdownhook != NULL) shutdownhook_disestablish(sc->sc_shutdownhook); + if (sc->sc_intr_xfer != NULL) { + timeout_del(&sc->sc_poll_handle); + sc->sc_intr_xfer = NULL; + } + /* Free all xfers associated with this HC. */ for (;;) { xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers); |