From: Stefan Richter Date: Fri, 6 Oct 2006 17:49:52 +0000 (+0200) Subject: ieee1394: nodemgr: fix startup of knodemgrd X-Git-Tag: v2.6.19-rc2~263^2 X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=b7a7179dcae6cecfaaa8384f8c088fb7823c6c90;p=powerpc.git ieee1394: nodemgr: fix startup of knodemgrd Revert a thinko in commit d2f119fe319528da8c76a1107459d6f478cbf28c: When knodemgrd starts, it needs to sleep until host->generation was incremented above its initial value of 0. My wrong logic caused it to start sending requests when the bus wasn't completely ready. Seen as "AT dma reset ctx=0, aborting transmission" messages in 2.6.19-rc1. Signed-off-by: Stefan Richter --- diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 3e7974c574..8e7b83f844 100644 --- 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 */