diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-10-05 10:37:11 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-03-24 20:56:37 +0100 |
| commit | d67cfb9613f373d76daa2c8d209629601424ca12 (patch) | |
| tree | 64d5633a8531fd1b978bef2104c6eee5303d3d8c /drivers/firewire/fw-device.h | |
| parent | cf417e5494582453c033d8cac9e1352e74215435 (diff) | |
| download | blackbird-op-linux-d67cfb9613f373d76daa2c8d209629601424ca12.tar.gz blackbird-op-linux-d67cfb9613f373d76daa2c8d209629601424ca12.zip | |
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 @@ #include <linux/cdev.h> #include <linux/idr.h> #include <linux/rwsem.h> -#include <linux/spinlock.h> +#include <linux/mutex.h> #include <asm/atomic.h> enum fw_device_state { @@ -65,9 +65,10 @@ struct fw_device { bool cmc; struct fw_card *card; struct device device; - /* to prevent deadlocks, never take this lock with card->lock held */ - spinlock_t client_list_lock; + + struct mutex client_list_mutex; struct list_head client_list; + u32 *config_rom; size_t config_rom_length; int config_rom_retries; |
