X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Ffirewire%2Ffw-topology.c;h=36c9be75b025b445e931ff494c344646f672e60c;hb=993baca3dde7959567e3c7c262c2bc843ba241de;hp=27c6cb9c8367452265c018451e97a7de13d1ded4;hpb=7f37c426c68d34aa221ce29262c1eba39034ac97;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index 27c6cb9c8367..36c9be75b025 100644
--- a/drivers/firewire/fw-topology.c
+++ b/drivers/firewire/fw-topology.c
@@ -483,6 +483,7 @@ fw_core_handle_bus_reset(struct fw_card *card,
 	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);
 
@@ -498,8 +499,6 @@ fw_core_handle_bus_reset(struct fw_card *card,
 		update_tree(card, local_node);
 	}
 
-	schedule_delayed_work(&card->work, 0);
-
 	spin_unlock_irqrestore(&card->lock, flags);
 }
 EXPORT_SYMBOL(fw_core_handle_bus_reset);