1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
index 8ef6ec2ca21c..008a7908a865 100644
--- a/drivers/firewire/fw-device.h
+++ b/drivers/firewire/fw-device.h
@@ -23,6 +23,7 @@
 #include <linux/cdev.h>
 #include <linux/idr.h>
 #include <linux/rwsem.h>
+#include <linux/spinlock.h>
 #include <asm/atomic.h>
 
 enum fw_device_state {
@@ -64,6 +65,8 @@ 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 list_head client_list;
         u32 *config_rom;
         size_t config_rom_length;