patch-2.3.99-pre4 linux/drivers/acorn/char/keyb_ps2.c

Next file: linux/drivers/acorn/scsi/acornscsi.h
Previous file: linux/arch/sparc64/solaris/timod.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre3/linux/drivers/acorn/char/keyb_ps2.c linux/drivers/acorn/char/keyb_ps2.c
@@ -32,8 +32,6 @@
 extern void kbd_reset_kdown(void);
 int kbd_read_mask;
 
-#define IRQ_KEYBOARDRX 15
-
 #define VERSION 100
 
 #define KBD_REPORT_ERR
@@ -330,6 +328,10 @@
 {
 	unsigned long flags;
 
+	/* Reset the keyboard state machine. */
+	outb(0, IOMD_KCTRL);
+	outb(8, IOMD_KCTRL);
+
 	save_flags_cli (flags);
 	if (request_irq (IRQ_KEYBOARDRX, ps2kbd_rx, 0, "keyboard", NULL) != 0)
 		panic("Could not allocate keyboard receive IRQ!");
@@ -342,4 +344,3 @@
 	printk (KERN_INFO "PS/2 keyboard driver v%d.%02d\n", VERSION/100, VERSION%100);
 	return 0;
 }
-

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)