The patch titled ieee1394: skip unnecessary pause when scanning config ROMs has been added to the -mm tree. Its filename is ieee1394-skip-unnecessary-pause-when-scanning-config-roms.patch From: Jody McIntyre ieee1394/nodemgr: 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 Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton --- drivers/ieee1394/nodemgr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/ieee1394/nodemgr.c~ieee1394-skip-unnecessary-pause-when-scanning-config-roms drivers/ieee1394/nodemgr.c --- 25/drivers/ieee1394/nodemgr.c~ieee1394-skip-unnecessary-pause-when-scanning-config-roms Thu Sep 22 15:07:14 2005 +++ 25-akpm/drivers/ieee1394/nodemgr.c Thu Sep 22 15:07:14 2005 @@ -64,10 +64,10 @@ static int nodemgr_bus_read(struct csr12 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)) _ Patches currently in -mm which might be from scjody@steamballoon.com are maintainers-sbp2-driver-is-not-orphaned.patch sbp2-fix-deadlocks-and-delays-on-device-removal-rmmod.patch sbp2-default-to-serialize_io=1.patch ieee1394-reorder-activities-after-bus-reset-fixes-device-detection.patch ieee1394-skip-unnecessary-pause-when-scanning-config-roms.patch ieee1394-fix-for-debug-output.patch ieee1394-use-time_before.patch ieee1394-trivial-edits-of-a-few-comments.patch ieee1394-remove-superfluous-include-in-csr1212.patch eth1394-workaround-limitation-in-rawiso-routines.patch ieee1394-delete-legacy-module-aliases.patch ohci1394-less-noise-in-dmesg.patch