patch-2.1.127 linux/drivers/sbus/char/pcikbd.c

• Lines: 39
• Date: Thu Nov 5 09:58:44 1998
• Orig file: v2.1.126/linux/drivers/sbus/char/pcikbd.c
• Orig date: Mon Oct 5 13:13:40 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/sbus/char/pcikbd.c linux/drivers/sbus/char/pcikbd.c
@@ -1,4 +1,4 @@
-/* $Id: pcikbd.c,v 1.22 1998/09/21 05:06:45 jj Exp $
+/* $Id: pcikbd.c,v 1.23 1998/10/07 11:35:24 jj Exp $
  * pcikbd.c: Ultra/AX PC keyboard support.
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
@@ -36,13 +36,6 @@
 #else
 #define PCI_KB_NAME	"keyboard"
 #define PCI_MS_NAME	"mouse"
-/*
- * XXX.
- * Gleb defines check_region and request_region here.
- * This looks suspicios because he neglects to call
- * sparc_alloc_io, but the conflict with sparc_alloc_io is what
- * causes problems.
- */
 #endif
 
 #include "pcikbd.h"
@@ -517,7 +510,7 @@
 			for_each_ebusdev(edev, ebus) {
 				if(!strcmp(edev->prom_name, "8042")) {
 					for_each_edevchild(edev, child) {
-						if (!strcmp(child->prom_name, "kb_ps2"))
+                                                if (!strcmp(child->prom_name, PCI_KB_NAME))
 							goto found;
 					}
 				}
@@ -698,8 +691,7 @@
 		    == AUX_STAT_OBF)
 			pcimouse_inb(pcimouse_iobase + KBD_DATA_REG);
 		current->state = TASK_INTERRUPTIBLE;
-		current->timeout = jiffies + (5*HZ + 99) / 100;
-		schedule();
+		schedule_timeout((5*HZ + 99)/100);
 		retries++;
 	}
 	return (retries < MAX_RETRIES);