1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 2ff4342ae362..a9ceb39751a1 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1547,6 +1547,10 @@ qla2x00_dev_loss_tmo_callbk(struct fc_rport *rport)
         *((fc_port_t **)rport->dd_data) = NULL;
         spin_unlock_irq(host->host_lock);
 
+        /* Now that the rport has been deleted, set the fcport state to
+           FCS_DEVICE_DEAD */
+        atomic_set(&fcport->state, FCS_DEVICE_DEAD);
+
         if (test_bit(ABORT_ISP_ACTIVE, &fcport->vha->dpc_flags))
                 return;