Commit 7ff3e52c authored Oct 08, 2006 by Linus Torvalds

Merge branch 'upstream-linus' of...

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

parents ff3df54e b7a7179d

drivers/ieee1394/nodemgr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */