fix for keyboard lockup with ps/2 mouse in linux-2.1.43

James Bottomley (James.Bottomley@columbiasc.ncr.com)
Fri, 04 Jul 1997 19:50:00 -0500


This is a multipart MIME message.

--===_0_Fri_Jul__4_19:49:23_CDT_1997
Content-Type: text/plain; charset=us-ascii

Attached is the diff that allows the keyboard to work again for me with a ps/2
mouse. aux_write_dev_nosleep is sending data to the wrong register in
psaux_init (KBD_CCMD_WRITE_MOUSE instead of KBD_CCMD_WRITE_MODE).

James Bottomley

--===_0_Fri_Jul__4_19:49:23_CDT_1997
Content-Type: text/plain; charset=us-ascii
Content-Description: psaux.diff

--- psaux.c~ Mon Jun 16 17:58:39 1997
+++ psaux.c Fri Jul 4 19:39:08 1997
@@ -628,7 +628,10 @@
poll_aux_status_nosleep();
#endif /* INITIALIZE_DEVICE */
outb_p(KBD_CCMD_MOUSE_DISABLE, KBD_CNTL_REG); /* Disable Aux device */
- aux_write_dev_nosleep(AUX_INTS_OFF); /* Disable controller interrupts */
+ poll_aux_status_nosleep();
+ outb_p(KBD_CCMD_WRITE_MODE, KBD_CNTL_REG);
+ poll_aux_status_nosleep();
+ outb_p(AUX_INTS_OFF, KBD_DATA_REG);
}
return 0;
}

--===_0_Fri_Jul__4_19:49:23_CDT_1997--