summaryrefslogtreecommitdiff
path: root/sys/dev/pcmcia/if_ep_pcmcia.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2005-01-27 17:04:57 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2005-01-27 17:04:57 +0000
commite2e21911f37c4003cbf60a7f2cf01287dbf71565 (patch)
tree11e0f79fe51124bcf8a0805a8771ccd372bdc2c6 /sys/dev/pcmcia/if_ep_pcmcia.c
parent7b4677abf4abc2b0e1c8b1d23b4f711f4839f65c (diff)
Use pcmcia_intr_string() for printing the irq (or error) string.
Diffstat (limited to 'sys/dev/pcmcia/if_ep_pcmcia.c')
-rw-r--r--sys/dev/pcmcia/if_ep_pcmcia.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index 51dc7168bf7..75deb7c2649 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.31 2004/05/12 06:35:11 tedu Exp $ */
+/* $OpenBSD: if_ep_pcmcia.c,v 1.32 2005/01/27 17:04:55 millert Exp $ */
/* $NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $ */
/*-
@@ -280,6 +280,7 @@ ep_pcmcia_attach(parent, self, aux)
struct ep_pcmcia_product *epp;
u_int8_t myla[ETHER_ADDR_LEN];
u_int8_t *enaddr = NULL;
+ const char *intrstr;
int i;
psc->sc_pf = pa->pf;
@@ -370,10 +371,11 @@ ep_pcmcia_attach(parent, self, aux)
#endif
/* establish the interrupt. */
- sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, epintr,
- sc, "");
- if (sc->sc_ih == NULL)
- printf(", couldn't establish interrupt");
+ sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, epintr, sc,
+ sc->sc_dev.dv_xname);
+ intrstr = pcmcia_intr_string(psc->sc_pf, sc->sc_ih);
+ if (*intrstr)
+ printf(", %s", intrstr);
printf(":");