diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2005-01-11 22:07:59 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2005-01-11 22:07:59 +0000 |
| commit | 64494d5904cd07d54e25c7140db226580d9e94da (patch) | |
| tree | 7ba3b7d9a04e1eb37c9e17424a41a8a95637a1eb /sys/dev | |
| parent | 5a49bf9b32d158c0442dd582b63157a23b1b09c9 (diff) | |
Pass device names on intr_establish() call, other drivers need this too.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pcmcia/if_wi_pcmcia.c | 5 | ||||
| -rw-r--r-- | sys/dev/pcmcia/wdc_pcmcia.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index c9a2c5e9b86..ec8d2d46a38 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.56 2004/11/23 21:12:23 fgsch Exp $ */ +/* $OpenBSD: if_wi_pcmcia.c,v 1.57 2005/01/11 22:07:58 drahn Exp $ */ /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */ /* @@ -415,7 +415,8 @@ wi_pcmcia_attach(parent, self, aux) CSR_WRITE_2(sc, WI_EVENT_ACK, 0xffff); /* Establish the interrupt. */ - sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, wi_intr, psc, ""); + sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, wi_intr, psc, + sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf("%s: couldn't establish interrupt\n", sc->sc_dev.dv_xname); diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c index b2e3e0d8918..a70da391142 100644 --- a/sys/dev/pcmcia/wdc_pcmcia.c +++ b/sys/dev/pcmcia/wdc_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_pcmcia.c,v 1.14 2002/03/14 01:27:01 millert Exp $ */ +/* $OpenBSD: wdc_pcmcia.c,v 1.15 2005/01/11 22:07:58 drahn Exp $ */ /* $NetBSD: wdc_pcmcia.c,v 1.19 1999/02/19 21:49:43 abs Exp $ */ /*- @@ -372,7 +372,7 @@ wdc_pcmcia_attach(parent, self, aux) #else /* Establish the interrupt handler. */ sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_BIO, wdcintr, - &sc->wdc_channel, ""); + &sc->wdc_channel, sc->sc_wdcdev.sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf("couldn't establish interrupt handler"); } |