summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/dev/apci.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2001-05-10 01:43:32 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2001-05-10 01:43:32 +0000
commit97373a3318e1d990f01acb18f6083e168690d429 (patch)
tree56655d2a39b924f072ff5d3a302781d4f85d27cd /sys/arch/hp300/dev/apci.c
parentc4a25342eaf443f8db649ebd53350c58588ecac0 (diff)
Move the timeout_set() call up a bit
Diffstat (limited to 'sys/arch/hp300/dev/apci.c')
-rw-r--r--sys/arch/hp300/dev/apci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c
index 571fb98f588..dff2c9cc1c7 100644
--- a/sys/arch/hp300/dev/apci.c
+++ b/sys/arch/hp300/dev/apci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apci.c,v 1.4 2001/05/01 16:51:08 millert Exp $ */
+/* $OpenBSD: apci.c,v 1.5 2001/05/10 01:43:31 millert Exp $ */
/* $NetBSD: apci.c,v 1.1 1997/05/12 08:12:36 thorpej Exp $ */
/*
@@ -207,6 +207,9 @@ apciattach(parent, self, aux)
(struct apciregs *)IIOV(FRODO_BASE + fa->fa_offset);
sc->sc_flags = 0;
+ /* Initialize timeout structure */
+ timeout_set(&sc->sc_timeout, apcitimeout, sc);
+
/* Are we the console? */
if (apci == apci_cn) {
sc->sc_flags |= APCI_ISCONSOLE;
@@ -229,9 +232,6 @@ apciattach(parent, self, aux)
frodo_intr_establish(parent, apciintr, sc, fa->fa_line,
(sc->sc_flags & APCI_HASFIFO) ? IPL_TTY : IPL_TTYNOBUF);
- /* Initialize timeout structure */
- timeout_set(&sc->sc_timeout, apcitimeout, sc);
-
/* Set soft carrier if requested by operator. */
if (self->dv_cfdata->cf_flags)
sc->sc_flags |= APCI_SOFTCAR;