summaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-topology.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-03-24 20:56:40 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2009-01-20 19:29:51 +0100
commit8cd0bbbdff7471163cc6a058be8b8610ddd01d6b (patch)
treede25f60d599ddef9a0ee88357dc418dbdf95b51d /drivers/firewire/fw-topology.c
parenta5c7f4710fba334bf613d705f97b4471b36446f8 (diff)
downloadblackbird-op-linux-8cd0bbbdff7471163cc6a058be8b8610ddd01d6b.tar.gz
blackbird-op-linux-8cd0bbbdff7471163cc6a058be8b8610ddd01d6b.zip
firewire: unnecessary BM delay after generation rollover
Noticed by Jarod Wilson: The bus manager work was unnecessarily delayed each time the bus generation counter rolled over. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Jarod Wilson <jwilson@redhat.com>
Diffstat (limited to 'drivers/firewire/fw-topology.c')
-rw-r--r--drivers/firewire/fw-topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index e7520e4bd6bc..8dd6703b55cd 100644
--- a/drivers/firewire/fw-topology.c
+++ b/drivers/firewire/fw-topology.c
@@ -523,7 +523,7 @@ fw_core_handle_bus_reset(struct fw_card *card,
* previously processed one, we cannot reliably compare the
* old and new topologies.
*/
- if ((generation & 0xff) != ((card->generation + 1) & 0xff) &&
+ if (!is_next_generation(generation, card->generation) &&
card->local_node != NULL) {
fw_notify("skipped bus generations, destroying all nodes\n");
fw_destroy_nodes(card);
OpenPOWER on IntegriCloud