Support the ejection of mii ep(4) devices, i.e., the 3c574.

1 files changed, 5 insertions, 6 deletions

diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index 6a84b4c3893..ae8524b3574 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.25 2000/06/28 18:03:37 millert Exp $	*/
+/*	$OpenBSD: if_ep_pcmcia.c,v 1.26 2000/09/15 22:28:52 aaron Exp $	*/
 /*	$NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $  */
 
 /*-
@@ -391,16 +391,15 @@ ep_pcmcia_detach(dev, flags)
 	struct device *dev;
 	int flags;
 {
+	int rv;
 	struct ep_pcmcia_softc *psc = (struct ep_pcmcia_softc *)dev;
-	struct ep_softc *sc = &psc->sc_ep;
-	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
+
+	if ((rv = ep_detach(dev)) != 0)
+		return (rv);
 
 	pcmcia_io_unmap(psc->sc_pf, psc->sc_io_window);
 	pcmcia_io_free(psc->sc_pf, &psc->sc_pcioh);
 
-	ether_ifdetach(ifp);
-	if_detach(ifp);
-
 	return (0);
 }