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.h | |
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.h')
-rw-r--r-- | drivers/firewire/fw-device.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h index 008a7908a865..655d7e838012 100644 --- a/drivers/firewire/fw-device.h +++ b/drivers/firewire/fw-device.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <linux/cdev.h> | 23 | #include <linux/cdev.h> |
24 | #include <linux/idr.h> | 24 | #include <linux/idr.h> |
25 | #include <linux/rwsem.h> | 25 | #include <linux/rwsem.h> |
26 | #include <linux/spinlock.h> | 26 | #include <linux/mutex.h> |
27 | #include <asm/atomic.h> | 27 | #include <asm/atomic.h> |
28 | 28 | ||
29 | enum fw_device_state { | 29 | enum fw_device_state { |
@@ -65,9 +65,10 @@ struct fw_device { | |||
65 | bool cmc; | 65 | bool cmc; |
66 | struct fw_card *card; | 66 | struct fw_card *card; |
67 | struct device device; | 67 | struct device device; |
68 | /* to prevent deadlocks, never take this lock with card->lock held */ | 68 | |
69 | spinlock_t client_list_lock; | 69 | struct mutex client_list_mutex; |
70 | struct list_head client_list; | 70 | struct list_head client_list; |
71 | |||
71 | u32 *config_rom; | 72 | u32 *config_rom; |
72 | size_t config_rom_length; | 73 | size_t config_rom_length; |
73 | int config_rom_retries; | 74 | int config_rom_retries; |