Skip to contentSkip to conversation

amendment to "firewire: reread config ROM when device reset the bus"

PATCH New Stefan Richter 1 participant 1 message Mar 24, 2008 Firewire

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 amendment to "firewire: reread config ROM when device reset the bus"

This applies after and should be rolled into patch "firewire: reread config ROM when device reset the bus".

Fix:
fw_device_refresh() sometimes forgot to reschedule the bus manager work. Among else, this kept the bus in danger of PHYs having different gap counts, which resulted in "giving up on config ROM" or other errors.

Optimization:
We can start re-reading the config ROM of the local node without dealy.

---
 drivers/firewire/fw-device.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/firewire/fw-device.c +3 -3
@@ -877,8 +877,7 @@ static void fw_device_refresh(struct wor
 
 		fw_device_update(work);
 		device->config_rom_retries = 0;
-
-		return;
+		goto out;
 
 	case REREAD_BIB_CHANGED:
 		break;
@@ -982,7 +981,8 @@ void fw_node_event(struct fw_card *card,
 			    FW_DEVICE_RUNNING,
 			    FW_DEVICE_INITIALIZING) == FW_DEVICE_RUNNING) {
 			PREPARE_DELAYED_WORK(&device->work, fw_device_refresh);
-			schedule_delayed_work(&device->work, INITIAL_DELAY);
+			schedule_delayed_work(&device->work,
+				node == card->local_node ? 0 : INITIAL_DELAY);
 		}
 		break;
 
Signature · 3 lines
Stefan Richter
-=====-==--- --== ==---
http://arcgraph.de/sr/