summaryrefslogtreecommitdiff
path: root/drivers/firewire/fw-topology.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-02-06 19:49:35 (GMT)
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-03-09 21:02:53 (GMT)
commit993baca3dde7959567e3c7c262c2bc843ba241de (patch)
treebc924ea80ec97b3ef04d9f4017608f25ab70566b /drivers/firewire/fw-topology.c
parent7f37c426c68d34aa221ce29262c1eba39034ac97 (diff)
downloadlinux-993baca3dde7959567e3c7c262c2bc843ba241de.tar.xz
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>
Diffstat (limited to 'drivers/firewire/fw-topology.c')
-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 27c6cb9..36c9be7 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);