diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2003-08-05 16:14:48 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2003-08-05 16:14:48 +0000 |
| commit | 56b07ed84ede1d64cb26bb8cd35e3f675f02e17e (patch) | |
| tree | 1a4f68ffa2f44fcab8f3daab0c690bab7317c542 /sys | |
| parent | b98d48f6b016092e5abf73849149e27d12e791cc (diff) | |
print dv_xname instead of the uninitialized variable card; ok miod/henning/deraadt
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/cy.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c index 3fc48432193..c1c4908476a 100644 --- a/sys/dev/ic/cy.c +++ b/sys/dev/ic/cy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cy.c,v 1.21 2003/01/05 22:41:35 deraadt Exp $ */ +/* $OpenBSD: cy.c,v 1.22 2003/08/05 16:14:47 markus Exp $ */ /* * Copyright (c) 1996 Timo Rossi. * All rights reserved. @@ -941,7 +941,7 @@ cy_modem_control(cy, bits, howto) void cy_poll(void *arg) { - int card, port; + int port; struct cy_softc *sc = arg; struct cy_port *cy; struct tty *tp; @@ -1049,9 +1049,9 @@ cy_poll(void *arg) CD1400_MSVR2_CD) != 0); #ifdef CY_DEBUG - printf("cy_poll: carrier change " - "(card %d, port %d, carrier %d)\n", - card, port, carrier); + printf("%s: cy_poll: carrier change " + "(port %d, carrier %d)\n", + sc->sc_dev.dv_xname, port, carrier); #endif if (CY_DIALIN(tp->t_dev) && !(*linesw[tp->t_line].l_modem)(tp, carrier)) @@ -1083,13 +1083,13 @@ cy_poll(void *arg) cy->cy_fifo_overruns = 0; /* doesn't report overrun count, but shouldn't really matter */ - log(LOG_WARNING, "cy%d port %d fifo overrun\n", - card, port); + log(LOG_WARNING, "%s: port %d fifo overrun\n", + sc->sc_dev.dv_xname, port); } if (cy->cy_ibuf_overruns) { cy->cy_ibuf_overruns = 0; - log(LOG_WARNING, "cy%d port %d ibuf overrun\n", - card, port); + log(LOG_WARNING, "%s: port %d ibuf overrun\n", + sc->sc_dev.dv_xname, port); } } /* for(port...) */ #ifdef CY_DEBUG1 |