Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-4]: src/sys/arch/hp300/dev Pull up revision 1.44 (requested by ...



details:   https://anonhg.NetBSD.org/src/rev/c35b86831650
branches:  netbsd-1-4
changeset: 470856:c35b86831650
user:      he <he%NetBSD.org@localhost>
date:      Mon Aug 14 14:24:12 2000 +0000

description:
Pull up revision 1.44 (requested by tsutsui):
  Fix keyboard related panic when ite device is configured
  but not attached.  Fixes PR#10750.

diffstat:

 sys/arch/hp300/dev/ite.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r c708a8e97290 -r c35b86831650 sys/arch/hp300/dev/ite.c
--- a/sys/arch/hp300/dev/ite.c  Mon Aug 14 14:22:04 2000 +0000
+++ b/sys/arch/hp300/dev/ite.c  Mon Aug 14 14:24:12 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ite.c,v 1.41 1998/04/20 20:41:05 frueauf Exp $ */
+/*     $NetBSD: ite.c,v 1.41.8.1 2000/08/14 14:24:12 he Exp $  */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -526,11 +526,13 @@
        static int capsmode = 0;
        static int metamode = 0;
        char code, *str;
-       struct tty *kbd_tty = kbd_ite->tty;
+       struct tty *kbd_tty;
 
-       if (kbd_tty == NULL)
+       if (kbd_ite == NULL || kbd_ite->tty == NULL)
                return;
 
+       kbd_tty = kbd_ite->tty;
+
        switch (c & 0xFF) {
        case KBD_CAPSLOCK:
                capsmode = !capsmode;



Home | Main Index | Thread Index | Old Index