Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', 'x86/debug...

[linux-2.6-omap-h63xx.git] / drivers / firewire / fw-topology.c

diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index e7520e4bd6bcea739655b16a0b8c826d3068e172..8dd6703b55cd00702f64f84272d3d523d7112ec6 100644 (file)
--- 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);