diff options
| author | nyan <nyan@FreeBSD.org> | 2005-02-11 03:41:34 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2005-02-11 03:41:34 +0000 |
| commit | 31fed443dd3abc3c9abb413958b041157a90b724 (patch) | |
| tree | 905854653fe339552ea5b0efc25c7bc5ba8a3859 /sys/pc98/cbus | |
| parent | 0740f7d7b6e3543f64845dc816668d8b6f8ee1cf (diff) | |
| download | FreeBSD-src-31fed443dd3abc3c9abb413958b041157a90b724.zip FreeBSD-src-31fed443dd3abc3c9abb413958b041157a90b724.tar.gz | |
Merged from sys/dev/sio/sio.c revision 1.458.
Diffstat (limited to 'sys/pc98/cbus')
| -rw-r--r-- | sys/pc98/cbus/sio.c | 14 |
1 files changed, 5 insertions, 9 deletions
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); } |
