aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-02-06 14:49:35 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-03-09 22:02:53 +0100
commit993baca3dde7959567e3c7c262c2bc843ba241de (patch)
treebc924ea80ec97b3ef04d9f4017608f25ab70566b
parent7f37c426c68d34aa221ce29262c1eba39034ac97 (diff)
firewire: Schedule topology work before calling driver update functions.
This prevents superfluous bus traffic as fw-sbp2 logs in only to get kicked off the device by another bus reset as the driver core does bus management. Scheduling it this way lets the driver core finish bus management before higher level drivers get the update callback. Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r--drivers/firewire/fw-topology.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index 27c6cb9c836..36c9be75b02 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);