[src/jmcneill-usbmp]: src/sys/dev/usb change callout_stop + usbd_delay_ms to ...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b2fe66350ed9
branches:  jmcneill-usbmp
changeset: 771765:b2fe66350ed9
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Dec 04 19:22:56 2011 +0000

description:
change callout_stop + usbd_delay_ms to callout_halt + callout_destroy in
ehci_detach

diffstat:

 sys/dev/usb/ehci.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r bd21947d7c53 -r b2fe66350ed9 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Sun Dec 04 13:23:16 2011 +0000
+++ b/sys/dev/usb/ehci.c        Sun Dec 04 19:22:56 2011 +0000
@@ -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 @@
        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)