diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 15:28:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 15:28:41 -0400 |
| commit | 7ff3e52cf2947ebd38c84159af68e5a29d228f6c (patch) | |
| tree | 17f1a54b368554b722c18c28852ded0f90856865 /drivers/ieee1394 | |
| parent | ff3df54efacff4ecdcab32826e45798453eecf90 (diff) | |
| parent | b7a7179dcae6cecfaaa8384f8c088fb7823c6c90 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: nodemgr: fix startup of knodemgrd
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/nodemgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 3e7974c57443..8e7b83f84485 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
| @@ -1614,7 +1614,7 @@ static int nodemgr_host_thread(void *__hi) | |||
| 1614 | { | 1614 | { |
| 1615 | struct host_info *hi = (struct host_info *)__hi; | 1615 | struct host_info *hi = (struct host_info *)__hi; |
| 1616 | struct hpsb_host *host = hi->host; | 1616 | struct hpsb_host *host = hi->host; |
| 1617 | unsigned int g, generation = get_hpsb_generation(host) - 1; | 1617 | unsigned int g, generation = 0; |
| 1618 | int i, reset_cycles = 0; | 1618 | int i, reset_cycles = 0; |
| 1619 | 1619 | ||
| 1620 | /* Setup our device-model entries */ | 1620 | /* Setup our device-model entries */ |