summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>1999-02-06 17:01:18 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>1999-02-06 17:01:18 +0000
commit2f060cb43225b4e5b0f50721ed89ac986b286a20 (patch)
treed321b31c6ea4839558d0de7a256449fbb81815f1 /sys
parenta58bfd344569a1e0c5d5c4c5ba6abb49734f6c88 (diff)
Always initialize sc->handle[i].flags.
Check if the socket is present before disabling the CSC_INTR.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/i82365.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c
index c656d10ab2e..cc13702cae5 100644
--- a/sys/dev/ic/i82365.c
+++ b/sys/dev/ic/i82365.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365.c,v 1.4 1999/01/28 04:58:33 fgsch Exp $ */
+/* $OpenBSD: i82365.c,v 1.5 1999/02/06 17:01:17 fgsch Exp $ */
/* $NetBSD: i82365.c,v 1.10 1998/06/09 07:36:55 thorpej Exp $ */
/*
@@ -227,6 +227,9 @@ pcic_attach(sc)
}
DPRINTF((" 0x%02x\n", reg));
+ } else {
+ sc->handle[2].flags = 0;
+ sc->handle[3].flags = 0;
}
if (count == 0)
@@ -237,13 +240,11 @@ pcic_attach(sc)
/* XXX block interrupts? */
for (i = 0; i < PCIC_NSLOTS; i++) {
-#if 0
/*
* this should work, but w/o it, setting tty flags hangs at
* boot time.
*/
if (sc->handle[i].flags & PCIC_FLAG_SOCKETP)
-#endif
{
pcic_write(&sc->handle[i], PCIC_CSC_INTR, 0);
pcic_read(&sc->handle[i], PCIC_CSC);