From 31fed443dd3abc3c9abb413958b041157a90b724 Mon Sep 17 00:00:00 2001 From: nyan Date: Fri, 11 Feb 2005 03:41:34 +0000 Subject: Merged from sys/dev/sio/sio.c revision 1.458. --- sys/pc98/cbus/sio.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'sys/pc98/cbus') diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index d009864..297f61d 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -3763,20 +3763,16 @@ siocnputc(struct consdev *cd, int c) } s = spltty(); need_unlock = 0; - if (!kdb_active) { - if (sio_inited == 2 && !mtx_owned(&sio_lock)) { - mtx_lock_spin(&sio_lock); - need_unlock = 1; - } + if (!kdb_active && sio_inited == 2 && !mtx_owned(&sio_lock)) { + mtx_lock_spin(&sio_lock); + need_unlock = 1; } siocnopen(&sp, iobase, speed); siocntxwait(iobase); outb(iobase + com_data, c); siocnclose(&sp, iobase); - if (!kdb_active) { - if (need_unlock) - mtx_unlock_spin(&sio_lock); - } + if (need_unlock) + mtx_unlock_spin(&sio_lock); splx(s); } -- cgit v1.1