You can pull this changeset from:
bk://kernel.bkbits.net/vojtech/input
===================================================================
ChangeSet@1.1361, 2003-06-21 04:34:11-07:00, vojtech@kernel.bkbits.net
input: Add locking to serio.c
serio.c | 13 +++++++++++++
1 files changed, 13 insertions(+)
===================================================================
diff -Nru a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
--- a/drivers/input/serio/serio.c Sat Jun 21 15:25:06 2003
+++ b/drivers/input/serio/serio.c Sat Jun 21 15:25:06 2003
@@ -58,6 +58,7 @@
struct list_head node;
};
+static DECLARE_MUTEX(serio_sem);
static LIST_HEAD(serio_list);
static LIST_HEAD(serio_dev_list);
static LIST_HEAD(serio_event_list);
@@ -90,9 +91,11 @@
switch (event->type) {
case SERIO_RESCAN :
+ down(&serio_sem);
if (event->serio->dev && event->serio->dev->disconnect)
event->serio->dev->disconnect(event->serio);
serio_find_dev(event->serio);
+ up(&serio_sem);
break;
default:
break;
@@ -153,30 +156,37 @@
void serio_register_port(struct serio *serio)
{
+ down(&serio_sem);
list_add_tail(&serio->node, &serio_list);
serio_find_dev(serio);
+ up(&serio_sem);
}
void serio_unregister_port(struct serio *serio)
{
+ down(&serio_sem);
list_del_init(&serio->node);
if (serio->dev && serio->dev->disconnect)
serio->dev->disconnect(serio);
+ up(&serio_sem);
}
void serio_register_device(struct serio_dev *dev)
{
struct serio *serio;
+ down(&serio_sem);
list_add_tail(&dev->node, &serio_dev_list);
list_for_each_entry(serio, &serio_list, node)
if (!serio->dev && dev->connect)
dev->connect(serio, dev);
+ up(&serio_sem);
}
void serio_unregister_device(struct serio_dev *dev)
{
struct serio *serio;
+ down(&serio_sem);
list_del_init(&dev->node);
list_for_each_entry(serio, &serio_list, node) {
@@ -184,8 +194,10 @@
dev->disconnect(serio);
serio_find_dev(serio);
}
+ up(&serio_sem);
}
+/* called from serio_dev->connect/disconnect methods under serio_sem */
int serio_open(struct serio *serio, struct serio_dev *dev)
{
if (serio->open(serio))
@@ -194,6 +206,7 @@
return 0;
}
+/* called from serio_dev->connect/disconnect methods under serio_sem */
void serio_close(struct serio *serio)
{
serio->close(serio);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Jun 23 2003 - 22:00:36 EST