diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-03-24 20:56:40 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-01-20 19:29:51 +0100 |
| commit | 8cd0bbbdff7471163cc6a058be8b8610ddd01d6b (patch) | |
| tree | de25f60d599ddef9a0ee88357dc418dbdf95b51d /drivers/firewire/fw-card.c | |
| parent | a5c7f4710fba334bf613d705f97b4471b36446f8 (diff) | |
| download | op-kernel-dev-8cd0bbbdff7471163cc6a058be8b8610ddd01d6b.zip op-kernel-dev-8cd0bbbdff7471163cc6a058be8b8610ddd01d6b.tar.gz | |
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-card.c')
| -rw-r--r-- | drivers/firewire/fw-card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c index 6bd91a1..17a80ce 100644 --- a/drivers/firewire/fw-card.c +++ b/drivers/firewire/fw-card.c @@ -232,7 +232,7 @@ fw_card_bm_work(struct work_struct *work) root_id = root_node->node_id; grace = time_after(jiffies, card->reset_jiffies + DIV_ROUND_UP(HZ, 10)); - if (card->bm_generation + 1 == generation || + if (is_next_generation(generation, card->bm_generation) || (card->bm_generation != generation && grace)) { /* * This first step is to figure out who is IRM and |
