diff options
| author | Uwe Stuehler <uwe@cvs.openbsd.org> | 2005-12-09 06:23:50 +0000 |
|---|---|---|
| committer | Uwe Stuehler <uwe@cvs.openbsd.org> | 2005-12-09 06:23:50 +0000 |
| commit | 335d8e78012676eb0db62d4e1209b74e22353e78 (patch) | |
| tree | 00f49307f9687d001263142ddfdd6657041b916c /sys/dev/pcmcia | |
| parent | 33b7593fa299dfdcdada8167f57c061af9daa619 (diff) | |
Don't disestablish a NULL interrupt handle after an incomplete attachment.
ok fgsch@ brad@
Diffstat (limited to 'sys/dev/pcmcia')
| -rw-r--r-- | sys/dev/pcmcia/if_ne_pcmcia.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c index 64ef2852db0..2f69c1e4f47 100644 --- a/sys/dev/pcmcia/if_ne_pcmcia.c +++ b/sys/dev/pcmcia/if_ne_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_pcmcia.c,v 1.85 2005/12/05 18:07:27 fgsch Exp $ */ +/* $OpenBSD: if_ne_pcmcia.c,v 1.86 2005/12/09 06:23:49 uwe Exp $ */ /* $NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $ */ /* @@ -860,7 +860,10 @@ ne_pcmcia_activate(dev, act) ifp->if_timer = 0; if (ifp->if_flags & IFF_RUNNING) dp8390_stop(esc); - pcmcia_intr_disestablish(sc->sc_pf, sc->sc_ih); + if (sc->sc_ih != NULL) { + pcmcia_intr_disestablish(sc->sc_pf, sc->sc_ih); + sc->sc_ih = NULL; + } pcmcia_function_disable(sc->sc_pf); break; } |