summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/fnic/fnic_scsi.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 05b203b9b69b..7e41bb8a7628 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -1972,14 +1972,11 @@ void fnic_scsi_unload(struct fnic *fnic)
*/
spin_lock_irqsave(&fnic->fnic_lock, flags);
fnic->iport.state = FNIC_IPORT_STATE_LINK_WAIT;
- spin_unlock_irqrestore(&fnic->fnic_lock, flags);
-
- if (fdls_get_state(&fnic->iport.fabric) != FDLS_STATE_INIT)
- fnic_fcpio_reset(fnic);
- spin_lock_irqsave(&fnic->fnic_lock, flags);
fnic->in_remove = 1;
spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+ fnic_fcpio_reset(fnic);
+
fnic_flush_tport_event_list(fnic);
fnic_delete_fcp_tports(fnic);
}