diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-10-05 04:37:11 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-03-24 15:56:37 -0400 |
commit | d67cfb9613f373d76daa2c8d209629601424ca12 (patch) | |
tree | 64d5633a8531fd1b978bef2104c6eee5303d3d8c /drivers/firewire/fw-device.c | |
parent | cf417e5494582453c033d8cac9e1352e74215435 (diff) |
firewire: convert client_list_lock to mutex
So far it is only taken in non-atomic contexts.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/fw-device.c')
-rw-r--r-- | drivers/firewire/fw-device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c index ffde1bed46b..2de3dd5ebc4 100644 --- a/drivers/firewire/fw-device.c +++ b/drivers/firewire/fw-device.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/idr.h> | 27 | #include <linux/idr.h> |
28 | #include <linux/jiffies.h> | 28 | #include <linux/jiffies.h> |
29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
30 | #include <linux/mutex.h> | ||
30 | #include <linux/rwsem.h> | 31 | #include <linux/rwsem.h> |
31 | #include <linux/semaphore.h> | 32 | #include <linux/semaphore.h> |
32 | #include <linux/spinlock.h> | 33 | #include <linux/spinlock.h> |
@@ -1005,7 +1006,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event) | |||
1005 | device->node = fw_node_get(node); | 1006 | device->node = fw_node_get(node); |
1006 | device->node_id = node->node_id; | 1007 | device->node_id = node->node_id; |
1007 | device->generation = card->generation; | 1008 | device->generation = card->generation; |
1008 | spin_lock_init(&device->client_list_lock); | 1009 | mutex_init(&device->client_list_mutex); |
1009 | INIT_LIST_HEAD(&device->client_list); | 1010 | INIT_LIST_HEAD(&device->client_list); |
1010 | 1011 | ||
1011 | /* | 1012 | /* |