patch-2.1.120 linux/drivers/char/psaux.c
Next file: linux/drivers/char/radio-miropcm20.c
Previous file: linux/drivers/char/pms.c
Back to the patch index
Back to the overall index
- Lines: 39
- Date:
Wed Sep 2 17:39:12 1998
- Orig file:
v2.1.119/linux/drivers/char/psaux.c
- Orig date:
Wed Aug 26 11:37:37 1998
diff -u --recursive --new-file v2.1.119/linux/drivers/char/psaux.c linux/drivers/char/psaux.c
@@ -245,6 +245,9 @@
fasync_aux(-1, file, 0);
if (--aux_count)
return 0;
+#ifdef CONFIG_VT
+ pckbd_read_mask = KBD_STAT_OBF;
+#endif
aux_start_atomic();
aux_write_cmd(AUX_INTS_OFF); /* Disable controller ints */
poll_aux_status();
@@ -297,6 +300,10 @@
poll_aux_status();
aux_end_atomic();
+#ifdef CONFIG_VT
+ pckbd_read_mask = AUX_STAT_OBF;
+#endif
+
aux_ready = 0;
return 0;
}
@@ -613,9 +620,6 @@
if (aux_device_present == 0xaa) {
printk(KERN_INFO "PS/2 auxiliary pointing device detected -- driver installed.\n");
aux_present = 1;
-#ifdef CONFIG_VT
- pckbd_read_mask = AUX_STAT_OBF;
-#endif
} else {
return -EIO;
}
@@ -643,6 +647,7 @@
poll_aux_status();
aux_end_atomic();
}
+
return 0;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov