summaryrefslogtreecommitdiff
path: root/sys/dev/pcmcia/if_ep_pcmcia.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_ep_pcmcia.c
parent505fe399f123db9a1f35ae87c7ec9f36d7df2526 (diff)
Do not unmap CCR before using them for the last time
Diffstat (limited to 'sys/dev/pcmcia/if_ep_pcmcia.c')
-rw-r--r--sys/dev/pcmcia/if_ep_pcmcia.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index c42a6ca0248..488a1fece08 100644
--- a/sys/dev/pcmcia/if_ep_pcmcia.c
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ep_pcmcia.c,v 1.22 2000/04/24 15:27:02 fgsch Exp $ */
+/* $OpenBSD: if_ep_pcmcia.c,v 1.23 2000/04/24 19:43:35 niklas Exp $ */
/* $NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $ */
/*-
@@ -255,8 +255,8 @@ ep_pcmcia_disable(sc)
{
struct ep_pcmcia_softc *psc = (struct ep_pcmcia_softc *) sc;
- ep_pcmcia_disable1(sc);
pcmcia_intr_disestablish(psc->sc_pf, sc->sc_ih);
+ ep_pcmcia_disable1(sc);
}
void
@@ -427,8 +427,8 @@ ep_pcmcia_activate(dev, act)
ifp->if_timer = 0;
if (ifp->if_flags & IFF_RUNNING)
epstop(esc);
- pcmcia_function_disable(sc->sc_pf);
pcmcia_intr_disestablish(sc->sc_pf, sc->sc_ep.sc_ih);
+ pcmcia_function_disable(sc->sc_pf);
break;
}
splx(s);