[src/trunk]: src/sys/dev/ic Use callout_halt() instead of callout_stop() - ot...

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

details:   https://anonhg.NetBSD.org/src/rev/9b812edca7b0
branches:  trunk
changeset: 754773:9b812edca7b0
user:      martin <martin%NetBSD.org@localhost>
date:      Wed May 12 10:25:23 2010 +0000

description:
Use callout_halt() instead of callout_stop() - otherwise gem_detach() might
be too fast and run callout_destroy() while another cpu is still busy
in the callout.

diffstat:

 sys/dev/ic/gem.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 1b3169ec62ef -r 9b812edca7b0 sys/dev/ic/gem.c
--- a/sys/dev/ic/gem.c  Wed May 12 08:11:16 2010 +0000
+++ b/sys/dev/ic/gem.c  Wed May 12 10:25:23 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gem.c,v 1.94 2010/04/05 07:19:34 joerg Exp $ */
+/*     $NetBSD: gem.c,v 1.95 2010/05/12 10:25:23 martin Exp $ */
 
 /*
  *
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.94 2010/04/05 07:19:34 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.95 2010/05/12 10:25:23 martin Exp $");
 
 #include "opt_inet.h"
 
@@ -714,7 +714,7 @@
 
        DPRINTF(sc, ("%s: gem_stop\n", device_xname(sc->sc_dev)));
 
-       callout_stop(&sc->sc_tick_ch);
+       callout_halt(&sc->sc_tick_ch, NULL);
        if ((sc->sc_flags & (GEM_SERDES | GEM_SERIAL)) != 0)
                gem_pcs_stop(sc, disable);
        else