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
This commit is contained in:
commit
7ff3e52cf2
1 changed files with 1 additions and 1 deletions
|
@ -1614,7 +1614,7 @@ static int nodemgr_host_thread(void *__hi)
|
||||||
{
|
{
|
||||||
struct host_info *hi = (struct host_info *)__hi;
|
struct host_info *hi = (struct host_info *)__hi;
|
||||||
struct hpsb_host *host = hi->host;
|
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;
|
int i, reset_cycles = 0;
|
||||||
|
|
||||||
/* Setup our device-model entries */
|
/* Setup our device-model entries */
|
||||||
|
|
Loading…
Reference in a new issue