summaryrefslogtreecommitdiff
path: root/sys/dev/pcmcia/if_cnw.c
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-04-24 19:43:37 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-04-24 19:43:37 +0000
commit70d2f3114d51aceb11c24356f5d49bb834e433bf (patch)
treede625cd7c646cb527960d788580648a870cf43c8 /sys/dev/pcmcia/if_cnw.c
parent505fe399f123db9a1f35ae87c7ec9f36d7df2526 (diff)
Do not unmap CCR before using them for the last time
Diffstat (limited to 'sys/dev/pcmcia/if_cnw.c')
-rw-r--r--sys/dev/pcmcia/if_cnw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c
index b1ca6f8bcb6..f28fa806d0a 100644
--- a/sys/dev/pcmcia/if_cnw.c
+++ b/sys/dev/pcmcia/if_cnw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cnw.c,v 1.5 2000/02/03 18:47:06 angelos Exp $ */
+/* $OpenBSD: if_cnw.c,v 1.6 2000/04/24 19:43:35 niklas Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -341,8 +341,8 @@ cnw_disable(sc)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
- pcmcia_function_disable(sc->sc_pf);
pcmcia_intr_disestablish(sc->sc_pf, sc->sc_ih);
+ pcmcia_function_disable(sc->sc_pf);
ifp->if_flags &= ~IFF_RUNNING;
ifp->if_timer = 0;
}
@@ -890,8 +890,8 @@ cnw_activate(dev, act)
case DVACT_DEACTIVATE:
ifp->if_timer = 0;
ifp->if_flags &= ~IFF_RUNNING; /* XXX no cnw_stop() ? */
- pcmcia_function_disable(sc->sc_pf);
pcmcia_intr_disestablish(sc->sc_pf, sc->sc_ih);
+ pcmcia_function_disable(sc->sc_pf);
break;
}
splx(s);