summaryrefslogtreecommitdiff
path: root/sys/dev/pcmcia/com_pcmcia.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/com_pcmcia.c
parent4eaefd11adca006e8c394f6504d254a7d08bf545 (diff)
quieten pcmcia/cardbus interrupt handling at unsuspend time
Diffstat (limited to 'sys/dev/pcmcia/com_pcmcia.c')
-rw-r--r--sys/dev/pcmcia/com_pcmcia.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index 97ef8236a7f..ebbb1e309a7 100644
--- a/sys/dev/pcmcia/com_pcmcia.c
+++ b/sys/dev/pcmcia/com_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_pcmcia.c,v 1.28 2001/03/28 19:59:48 millert Exp $ */
+/* $OpenBSD: com_pcmcia.c,v 1.29 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */
/*
@@ -248,10 +248,8 @@ com_pcmcia_activate(dev, act)
switch (act) {
case DVACT_ACTIVATE:
pcmcia_function_enable(sc->sc_pf);
- printf("%s:", sc->sc_com.sc_dev.dv_xname);
sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_TTY,
- comintr, sc);
- printf("\n");
+ comintr, sc, sc->sc_com.sc_dev.dv_xname);
break;
case DVACT_DEACTIVATE:
@@ -338,7 +336,8 @@ found:
com_attach_subr(sc);
#endif
/* establish the interrupt. */
- psc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_TTY, comintr, sc);
+ psc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_TTY,
+ comintr, sc, "");
if (psc->sc_ih == NULL)
printf(", couldn't establish interrupt");
@@ -378,7 +377,8 @@ com_pcmcia_enable(sc)
struct pcmcia_function *pf = psc->sc_pf;
/* establish the interrupt. */
- psc->sc_ih = pcmcia_intr_establish(pf, IPL_TTY, comintr, sc);
+ psc->sc_ih = pcmcia_intr_establish(pf, IPL_TTY, comintr, sc,
+ sc->sc_dev.dv_xname);
if (psc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt\n",
sc->sc_dev.dv_xname);