summaryrefslogtreecommitdiff
path: root/sys/dev/pcmcia/if_cnw.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-08-17 21:52:17 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-08-17 21:52:17 +0000
commit54a78f04df78dceb51aab78f8cb1db245ecddc9c (patch)
treea3d1ec59096526b8e7922f2473f7d489e29cf617 /sys/dev/pcmcia/if_cnw.c
parent4eaefd11adca006e8c394f6504d254a7d08bf545 (diff)
quieten pcmcia/cardbus interrupt handling at unsuspend time
Diffstat (limited to 'sys/dev/pcmcia/if_cnw.c')
-rw-r--r--sys/dev/pcmcia/if_cnw.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c
index 2f439b4f50a..b1ece1b0e73 100644
--- a/sys/dev/pcmcia/if_cnw.c
+++ b/sys/dev/pcmcia/if_cnw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cnw.c,v 1.9 2001/06/27 06:34:51 kjc Exp $ */
+/* $OpenBSD: if_cnw.c,v 1.10 2001/08/17 21:52:16 deraadt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -316,7 +316,8 @@ cnw_enable(sc)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
- sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET, cnw_intr, sc);
+ sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET,
+ cnw_intr, sc, "");
if (sc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt handler\n",
sc->sc_dev.dv_xname);
@@ -875,10 +876,8 @@ cnw_activate(dev, act)
switch (act) {
case DVACT_ACTIVATE:
pcmcia_function_enable(sc->sc_pf);
- printf("%s:", sc->sc_dev.dv_xname);
- sc->sc_ih =
- pcmcia_intr_establish(sc->sc_pf, IPL_NET, cnw_intr, sc);
- printf("\n");
+ sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET,
+ cnw_intr, sc, sc->sc_dev.dv_xname);
cnw_init(sc);
break;