Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure that we don't die if attach fails and we pull the card.

Browse Source
This commit is contained in:
christos 2002-04-03 00:18:31 +00:00
parent f8b9dbe468
commit 1a0ee78709
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/pcmcia/com_pcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_pcmcia.c,v 1.26 2002/03/10 19:20:50 cyber Exp $ */ /* $NetBSD: com_pcmcia.c,v 1.27 2002/04/03 00:18:31 christos Exp $ */
/*- /*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.26 2002/03/10 19:20:50 cyber Exp $"); __KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.27 2002/04/03 00:18:31 christos Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -217,6 +217,8 @@ com_pcmcia_attach(parent, self, aux)
psc->sc_pf = pa->pf; psc->sc_pf = pa->pf;
psc->sc_io_window = -1;
retry: retry:
/* find a cfe we can use */ /* find a cfe we can use */
@ -308,11 +310,13 @@ com_pcmcia_detach(self, flags)
struct com_pcmcia_softc *psc = (struct com_pcmcia_softc *) self; struct com_pcmcia_softc *psc = (struct com_pcmcia_softc *) self;
int error; int error;
if ((error = com_detach(self, flags)) != 0) if (psc->sc_io_window != -1) {
return error; if ((error = com_detach(self, flags)) != 0)
return error;
/* Unmap our i/o window. */ /* Unmap our i/o window. */
pcmcia_io_unmap(psc->sc_pf, psc->sc_io_window); pcmcia_io_unmap(psc->sc_pf, psc->sc_io_window);
}
/* Free our i/o space. */ /* Free our i/o space. */
pcmcia_io_free(psc->sc_pf, &psc->sc_pcioh); pcmcia_io_free(psc->sc_pf, &psc->sc_pcioh);