patch-2.4.0-test2 linux/drivers/sbus/char/pcikbd.c
Next file: linux/drivers/sbus/char/rtc.c
Previous file: linux/drivers/sbus/char/openprom.c
Back to the patch index
Back to the overall index
- Lines: 49
- Date:
Mon Jun 19 17:59:41 2000
- Orig file:
v2.4.0-test1/linux/drivers/sbus/char/pcikbd.c
- Orig date:
Thu May 11 15:30:07 2000
diff -u --recursive --new-file v2.4.0-test1/linux/drivers/sbus/char/pcikbd.c linux/drivers/sbus/char/pcikbd.c
@@ -1,4 +1,4 @@
-/* $Id: pcikbd.c,v 1.46 2000/05/03 06:37:05 davem Exp $
+/* $Id: pcikbd.c,v 1.48 2000/06/19 06:24:47 davem Exp $
* pcikbd.c: Ultra/AX PC keyboard support.
*
* Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)
@@ -737,8 +737,7 @@
spin_unlock_irqrestore(&pcikbd_lock, flags);
- if (queue->fasync)
- kill_fasync(queue->fasync, SIGIO, POLL_IN);
+ kill_fasync(&queue->fasync, SIGIO, POLL_IN);
wake_up_interruptible(&queue->proc_list);
}
@@ -762,7 +761,6 @@
spin_unlock_irqrestore(&pcikbd_lock, flags);
- MOD_DEC_USE_COUNT;
return 0;
}
@@ -790,8 +788,6 @@
}
queue->head = queue->tail = 0; /* Flush input queue */
- MOD_INC_USE_COUNT;
-
poll_aux_status();
pcimouse_outb(KBD_CCMD_MOUSE_ENABLE, pcimouse_iobase+KBD_CNTL_REG); /* Enable Aux */
aux_write_dev(AUX_ENABLE_DEV); /* Enable aux device */
@@ -902,6 +898,7 @@
}
struct file_operations psaux_fops = {
+ owner: THIS_MODULE,
read: aux_read,
write: aux_write,
poll: aux_poll,
@@ -916,6 +913,7 @@
}
struct file_operations psaux_no_fops = {
+ owner: THIS_MODULE,
open: aux_no_open,
};
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)