firewire: Schedule topology work before calling driver update functions.

[firefly-linux-kernel-4.4.55.git] / drivers / firewire / fw-topology.c

diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index fc8f1e7d3b076093b1badd72e0e37ed6b896d653..36c9be75b025b445e931ff494c344646f672e60c 100644 (file)
--- a/drivers/firewire/fw-topology.c
+++ b/drivers/firewire/fw-topology.c
@@ -476,12 +476,14 @@ fw_core_handle_bus_reset(struct fw_card *card,
         * changed, either nodes were added or removed. In that case we
         * reset the IRM reset counter. */
        if (card->self_id_count != self_id_count)
-               card->irm_retries = 0;
+               card->bm_retries = 0;
 
        card->node_id = node_id;
        card->self_id_count = self_id_count;
        card->generation = generation;
        memcpy(card->self_ids, self_ids, self_id_count * 4);
+       card->reset_jiffies = jiffies;
+       schedule_delayed_work(&card->work, 0);
 
        local_node = build_tree(card);
 
@@ -497,10 +499,6 @@ fw_core_handle_bus_reset(struct fw_card *card,
                update_tree(card, local_node);
        }
 
-       /* If we're not the root node, we may have to do some IRM work. */
-       if (card->local_node != card->root_node)
-               schedule_delayed_work(&card->work, 0);
-
        spin_unlock_irqrestore(&card->lock, flags);
 }
 EXPORT_SYMBOL(fw_core_handle_bus_reset);