summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2007-11-05 17:54:28 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2007-11-05 17:54:28 +0000
commit8aad5a992551725c3902669cbf03c232b591a89a (patch)
tree1830150b5cab31af0c6dc1fb73286a974223b42b /sys/dev
parent2b549d1d6a814f61e86d8bd72597b1d64e04ff90 (diff)
More scsi_done() at SPLBIO. Wrap another interrupt function call while
polling in splbio/splx.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/eisa/uha_eisa.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c
index 2e8c7fef6a2..978ee42916b 100644
--- a/sys/dev/eisa/uha_eisa.c
+++ b/sys/dev/eisa/uha_eisa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha_eisa.c,v 1.6 2007/04/10 17:47:55 miod Exp $ */
+/* $OpenBSD: uha_eisa.c,v 1.7 2007/11/05 17:54:27 krw Exp $ */
/* $NetBSD: uha_eisa.c,v 1.5 1996/10/21 22:31:07 thorpej Exp $ */
/*
@@ -258,14 +258,18 @@ u24_poll(sc, xs, count)
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
+ int s;
while (count) {
/*
* If we had interrupts enabled, would we
* have got an interrupt?
*/
- if (bus_space_read_1(iot, ioh, U24_SINT) & U24_SDIP)
+ if (bus_space_read_1(iot, ioh, U24_SINT) & U24_SDIP) {
+ s = splbio();
u24_intr(sc);
+ splx(s);
+ }
if (xs->flags & ITSDONE)
return (0);
delay(1000);