2 files changed, 6 insertions, 4 deletions

diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 9067629817ea..fdfbf83a6330 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -1254,10 +1254,9 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job)
                 return -EINVAL;
         }
 
-        if (fcport->loop_id == FC_NO_LOOP_ID) {
-                DEBUG2(printk(KERN_ERR "%s(%ld): Invalid port loop id, "
-                        "loop_id = 0x%x\n",
-                        __func__, vha->host_no, fcport->loop_id));
+        if (atomic_read(&fcport->state) != FCS_ONLINE) {
+                DEBUG2(printk(KERN_ERR "%s(%ld): Port not online\n",
+                        __func__, vha->host_no));
                 return -EINVAL;
         }
 
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index d863ed2619b5..9f71226e0a3e 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2785,6 +2785,9 @@ qla2x00_iidma_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
         if (!IS_IIDMA_CAPABLE(ha))
                 return;
 
+        if (atomic_read(&fcport->state) != FCS_ONLINE)
+                return;
+
         if (fcport->fp_speed == PORT_SPEED_UNKNOWN ||
             fcport->fp_speed > ha->link_data_rate)
                 return;