aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-card.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/firewire/fw-card.c')
-rw-r--r--drivers/firewire/fw-card.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 3322d6169bd1..74aab9aafd21 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -60,7 +60,7 @@ static int descriptor_count;
60#define bib_imc ((1) << 31) 60#define bib_imc ((1) << 31)
61 61
62static u32 * 62static u32 *
63generate_config_rom (struct fw_card *card, size_t *config_rom_length) 63generate_config_rom(struct fw_card *card, size_t *config_rom_length)
64{ 64{
65 struct fw_descriptor *desc; 65 struct fw_descriptor *desc;
66 static u32 config_rom[256]; 66 static u32 config_rom[256];
@@ -125,7 +125,7 @@ generate_config_rom (struct fw_card *card, size_t *config_rom_length)
125} 125}
126 126
127static void 127static void
128update_config_roms (void) 128update_config_roms(void)
129{ 129{
130 struct fw_card *card; 130 struct fw_card *card;
131 u32 *config_rom; 131 u32 *config_rom;
@@ -138,7 +138,7 @@ update_config_roms (void)
138} 138}
139 139
140int 140int
141fw_core_add_descriptor (struct fw_descriptor *desc) 141fw_core_add_descriptor(struct fw_descriptor *desc)
142{ 142{
143 size_t i; 143 size_t i;
144 144
@@ -156,7 +156,7 @@ fw_core_add_descriptor (struct fw_descriptor *desc)
156 156
157 mutex_lock(&card_mutex); 157 mutex_lock(&card_mutex);
158 158
159 list_add_tail (&desc->link, &descriptor_list); 159 list_add_tail(&desc->link, &descriptor_list);
160 descriptor_count++; 160 descriptor_count++;
161 if (desc->immediate > 0) 161 if (desc->immediate > 0)
162 descriptor_count++; 162 descriptor_count++;
@@ -169,7 +169,7 @@ fw_core_add_descriptor (struct fw_descriptor *desc)
169EXPORT_SYMBOL(fw_core_add_descriptor); 169EXPORT_SYMBOL(fw_core_add_descriptor);
170 170
171void 171void
172fw_core_remove_descriptor (struct fw_descriptor *desc) 172fw_core_remove_descriptor(struct fw_descriptor *desc)
173{ 173{
174 mutex_lock(&card_mutex); 174 mutex_lock(&card_mutex);
175 175
@@ -419,7 +419,7 @@ fw_card_add(struct fw_card *card,
419 fw_card_get(card); 419 fw_card_get(card);
420 420
421 mutex_lock(&card_mutex); 421 mutex_lock(&card_mutex);
422 config_rom = generate_config_rom (card, &length); 422 config_rom = generate_config_rom(card, &length);
423 list_add_tail(&card->link, &card_list); 423 list_add_tail(&card->link, &card_list);
424 mutex_unlock(&card_mutex); 424 mutex_unlock(&card_mutex);
425 425