diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2004-05-03 16:58:12 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2004-05-03 16:58:12 +0000 |
| commit | 5b3c3b153b81205ce727cb14eaf63da746a7b450 (patch) | |
| tree | c3b3349ef7754e57f4ed01c289eaf2bc4b0b06df /sys/dev/pcmcia | |
| parent | 186038428b2c97cc36eab9502c797e168096498e (diff) | |
If wi@pcmcia fails in wiattach(), disestablish the interrupt and
let the rest of the cleanup code run. ok millert@
Diffstat (limited to 'sys/dev/pcmcia')
| -rw-r--r-- | sys/dev/pcmcia/if_wi_pcmcia.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index 1254ec0e2d5..9b9f8e363cd 100644 --- a/sys/dev/pcmcia/if_wi_pcmcia.c +++ b/sys/dev/pcmcia/if_wi_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pcmcia.c,v 1.46 2004/04/06 21:08:57 millert Exp $ */ +/* $OpenBSD: if_wi_pcmcia.c,v 1.47 2004/05/03 16:58:11 drahn Exp $ */ /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */ /* @@ -353,8 +353,10 @@ wi_pcmcia_attach(parent, self, aux) goto bad; } - wi_attach(sc, &wi_func_io); - return; + if (wi_attach(sc, &wi_func_io) == 0) + return; + + pcmcia_intr_disestablish(psc->sc_pf, sc->sc_ih); bad: if (state > 2) |