Module Name: src
Committed By: jmcneill
Date: Sun Dec 4 19:22:57 UTC 2011
Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: ehci.c
Log Message:
change callout_stop + usbd_delay_ms to callout_halt + callout_destroy in
ehci_detach
To generate a diff of this commit:
cvs rdiff -u -r1.181.6.1 -r1.181.6.2 src/sys/dev/usb/ehci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.181.6.1 src/sys/dev/usb/ehci.c:1.181.6.2
--- src/sys/dev/usb/ehci.c:1.181.6.1 Sun Dec 4 13:23:16 2011
+++ src/sys/dev/usb/ehci.c Sun Dec 4 19:22:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.181.6.1 2011/12/04 13:23:16 jmcneill Exp $ */
+/* $NetBSD: ehci.c,v 1.181.6.2 2011/12/04 19:22:56 jmcneill Exp $ */
/*
* Copyright (c) 2004-2011 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.1 2011/12/04 13:23:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.2 2011/12/04 19:22:56 jmcneill Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -1157,9 +1157,8 @@ ehci_detach(struct ehci_softc *sc, int f
if (rv != 0)
return (rv);
- callout_stop(&sc->sc_tmo_intrlist);
-
- usb_delay_ms(&sc->sc_bus, 300); /* XXX let stray task complete */
+ callout_halt(&sc->sc_tmo_intrlist, NULL);
+ callout_destroy(&sc->sc_tmo_intrlist);
/* XXX free other data structures XXX */
if (sc->sc_softitds)
