Commit e31a127c authored Sep 30, 2005 by Jody McIntyre Committed by Linus Torvalds Sep 30, 2005

[PATCH] ieee1394: skip unnecessary pause when scanning config ROMs



Skip a superfluous pause that occured when the config ROM of a node was
scanned unsuccessfully.  This also occurs if a node without link wrongly
enables its "link active" self ID flag.  A GWCTech 6-port hub does this.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
Cc: Ben Collins <bcollins@debian.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 328699bf

drivers/ieee1394/nodemgr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -64,10 +64,10 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,
		struct nodemgr_csr_info ci = (struct nodemgr_csr_info)__ci;
		int i, ret = 0;

		for (i = 0; i < 3; i++) {
		for (i = 1; ; i++) {
		ret = hpsb_read(ci->host, ci->nodeid, ci->generation, addr,
		buffer, length);
		if (!ret)
		if (!ret \|\| i == 3)
		break;

		if (msleep_interruptible(334))