diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-10-06 19:49:52 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-10-08 12:10:26 +0200 |
| commit | b7a7179dcae6cecfaaa8384f8c088fb7823c6c90 (patch) | |
| tree | 613b16f40e2bf6a71f10edb058afe292e8acf2d2 /drivers/ieee1394 | |
| parent | 3253b669eed7194ae490acb4aadab7262bbfeb8d (diff) | |
| download | blackbird-op-linux-b7a7179dcae6cecfaaa8384f8c088fb7823c6c90.tar.gz blackbird-op-linux-b7a7179dcae6cecfaaa8384f8c088fb7823c6c90.zip | |
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 <stefanr@s5r6.in-berlin.de>
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) { 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 */ |
