Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / drivers / ieee1394 / nodemgr.c

diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 3e7974c5744326464e4f26eda25a4eef69e4468e..8e7b83f84485a1933b209d4017a74a288d19b64a 100644 (file)
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -1614,7 +1614,7 @@ static int nodemgr_host_thread(void *__hi)
 {
        struct host_info *hi = (struct host_info *)__hi;
        struct hpsb_host *host = hi->host;
-       unsigned int g, generation = get_hpsb_generation(host) - 1;
+       unsigned int g, generation = 0;
        int i, reset_cycles = 0;
 
        /* Setup our device-model entries */