summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2010-03-02 08:30:40 +0000
committermartin <martin@NetBSD.org>2010-03-02 08:30:40 +0000
commit9e8ef1a77bba033dec1137b80dfefc1d59cdc9c5 (patch)
treedee60a89123caad096698cd2d6a8a5e4421b7edd /sys
parented186a47bfb0620c44ee6289460f5de180249573 (diff)
Before destroying a autonegotiation callout, make sure it is quiet
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/mii/mii_physubr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index d83ee49fa67..81ffb21e1c7 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.67 2010/02/24 22:37:59 dyoung Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.68 2010/03/02 08:30:40 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.67 2010/02/24 22:37:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.68 2010/03/02 08:30:40 martin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -554,7 +554,7 @@ mii_phy_detach(device_t self, int flags)
/* XXX Invalidate parent's media setting? */
if (sc->mii_flags & MIIF_DOINGAUTO)
- callout_stop(&sc->mii_nway_ch);
+ callout_halt(&sc->mii_nway_ch, NULL);
callout_destroy(&sc->mii_nway_ch);