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.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
drivers/firewire/fw-device.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/firewire/fw-device.c 2008-03-24 19:10:42.000000000 +0100
+++ b/drivers/firewire/fw-device.c 2008-03-24 19:09:42.000000000 +0100
@@ -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;
--
Stefan Richter
-=====-==--- --== ==---
http://arcgraph.de/sr/
--
| Ryan Hope | reiser4 for 2.6.27-rc1 |
| Ingo Molnar | Re: 2.6.24-rc6-mm1 |
| Tim Tassonis | reiser4 for 2.6.27-rc1 |
| Ingo Molnar | Re: [patch] MTD: fix DOC2000/2001/2001PLUS build error |
git: | |
| Petko Manolov | git and binary files |
| Wink Saville | Resolving conflicts |
| Ken Pratt | pack operation is thrashing my server |
| Junio C Hamano | What's cooking in git.git (Aug 2008, #07; Sat, 23) |
| Richard Stallman | Real men don't attack straw men |
| Julien TOUCHE | setting up ssh tunnel/vpn |
| Jeffrey 'jf' Lim | Re: SSHJail patch for OpenBSD |
| Daniel Ouellet | identifying sparse files and get ride of them trick available? |
| Jim Winstead Jr. | Re: Root Disk/Book Disk Compatibility |
| Peter MacDonald | demand paging: proposal |
| Stephen Pierce | SLS |
| Drew Eckhardt | Re: 20MB drive & wdxt-gen2 controller on 386? |
