summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa/pcvt/pcvt_kbd.c
diff options
context:
space:
mode:
authoryokota <yokota@FreeBSD.org>1999-06-29 17:36:20 +0000
committeryokota <yokota@FreeBSD.org>1999-06-29 17:36:20 +0000
commit7fb36419071d5768903ebf116c82ab17cc774d91 (patch)
treea736022275c3c896a016e040fcb015bf3136b218 /sys/i386/isa/pcvt/pcvt_kbd.c
parent27806ee0a3e3c2d23ff030de96f244a2a8e0e4f3 (diff)
downloadFreeBSD-src-7fb36419071d5768903ebf116c82ab17cc774d91.zip
FreeBSD-src-7fb36419071d5768903ebf116c82ab17cc774d91.tar.gz
Keyboard allocation/deallocation fix.
- Do not try to allocate a keyboard in pccnprobe() when probing the vt driver for the kernel console. Rather, allocate a keyboard when initializing the vt driver in pccninit(). - Release the keyboard in pccnterm(). - Don't try to read from the keyboard, if it is not present.
Diffstat (limited to 'sys/i386/isa/pcvt/pcvt_kbd.c')
-rw-r--r--sys/i386/isa/pcvt/pcvt_kbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c
index ddcfda3..a394187 100644
--- a/sys/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/i386/isa/pcvt/pcvt_kbd.c
@@ -213,7 +213,7 @@ check_for_lost_intr (void *arg)
int opri;
lost_intr_timeout_queued = 0;
- if ((*kbdsw[kbd->kb_index]->lock)(kbd, TRUE)) {
+ if (kbd && (*kbdsw[kbd->kb_index]->lock)(kbd, TRUE)) {
opri = spltty ();
(*kbdsw[kbd->kb_index]->lock)(kbd, FALSE);
if ((*kbdsw[kbd->kb_index]->check)(kbd))
OpenPOWER on IntegriCloud