summaryrefslogtreecommitdiff
path: root/sys/dev/sio/sio.c
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1995-07-05 14:30:07 +0000
committerBruce Evans <bde@FreeBSD.org>1995-07-05 14:30:07 +0000
commitaa96081f8bb4238c50b42710ee4d33b4be4293a9 (patch)
treef68951a6ec30f9091b76c4c3ae354abc968a28f4 /sys/dev/sio/sio.c
parent94ec1fba9a786ec10ed2d04f09f2db7ba32a6e9a (diff)
Notes
Diffstat (limited to 'sys/dev/sio/sio.c')
-rw-r--r--sys/dev/sio/sio.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 558f1152f96d..4e09485528cb 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.100 1995/06/25 04:51:01 bde Exp $
+ * $Id: sio.c,v 1.101 1995/06/28 17:58:14 ache Exp $
*/
#include "sio.h"
@@ -2020,9 +2020,15 @@ siosettimeout()
}
}
}
- sio_timeouts_until_log = hz / sio_timeout;
- if (someopen)
+ if (someopen) {
+ sio_timeouts_until_log = hz / sio_timeout;
timeout(comwakeup, (void *)NULL, sio_timeout);
+ } else {
+ /* Flush error messages, if any. */
+ sio_timeouts_until_log = 1;
+ comwakeup((void *)NULL);
+ untimeout(comwakeup, (void *)NULL);
+ }
}
static void
@@ -2053,7 +2059,7 @@ comwakeup(chan)
*/
if (--sio_timeouts_until_log > 0)
return;
- sio_timeouts_until_log = sio_timeout;
+ sio_timeouts_until_log = hz / sio_timeout;
for (unit = 0; unit < NSIO; ++unit) {
int errnum;