diff options
Diffstat (limited to 'drivers/firewire/core-topology.c')
-rw-r--r-- | drivers/firewire/core-topology.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/firewire/core-topology.c b/drivers/firewire/core-topology.c index 3b9667c37b67..56e908ba43f1 100644 --- a/drivers/firewire/core-topology.c +++ b/drivers/firewire/core-topology.c | |||
@@ -524,7 +524,7 @@ static void update_topology_map(struct fw_card *card, | |||
524 | } | 524 | } |
525 | 525 | ||
526 | void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation, | 526 | void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation, |
527 | int self_id_count, u32 *self_ids) | 527 | int self_id_count, u32 *self_ids, bool bm_abdicate) |
528 | { | 528 | { |
529 | struct fw_node *local_node; | 529 | struct fw_node *local_node; |
530 | unsigned long flags; | 530 | unsigned long flags; |
@@ -552,8 +552,7 @@ void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation, | |||
552 | smp_wmb(); | 552 | smp_wmb(); |
553 | card->generation = generation; | 553 | card->generation = generation; |
554 | card->reset_jiffies = jiffies; | 554 | card->reset_jiffies = jiffies; |
555 | card->bm_abdicate = card->csr_abdicate; | 555 | card->bm_abdicate = bm_abdicate; |
556 | card->csr_abdicate = false; | ||
557 | fw_schedule_bm_work(card, 0); | 556 | fw_schedule_bm_work(card, 0); |
558 | 557 | ||
559 | local_node = build_tree(card, self_ids, self_id_count); | 558 | local_node = build_tree(card, self_ids, self_id_count); |