Messages in this thread Patch in this message | | | Date | Sun, 3 Feb 2008 23:10:47 +0100 (CET) | From | Stefan Richter <> | Subject | [PATCH 6/9] firewire: fw-sbp2: don't add scsi_device twice |
| |
When a reconnect failed but re-login succeeded, __scsi_add_device was called again.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> --- drivers/firewire/fw-sbp2.c | 6 ++++++ 1 file changed, 6 insertions(+)
Index: linux/drivers/firewire/fw-sbp2.c =================================================================== --- linux.orig/drivers/firewire/fw-sbp2.c +++ linux/drivers/firewire/fw-sbp2.c @@ -741,6 +741,12 @@ static void sbp2_login(struct work_struc PREPARE_DELAYED_WORK(&lu->work, sbp2_reconnect); sbp2_agent_reset(lu); + /* This was a re-login. */ + if (lu->sdev) { + sbp2_cancel_orbs(lu); + goto out; + } + if (lu->tgt->workarounds & SBP2_WORKAROUND_DELAY_INQUIRY) ssleep(SBP2_INQUIRY_DELAY); -- Stefan Richter -=====-==--- --=- ---== http://arcgraph.de/sr/
| |