1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 5bedc9d05942..2258152b1f41 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -173,7 +173,7 @@ void qla2x00_build_scsi_iocbs_32(srb_t *sp, cmd_entry_t *cmd_pkt,
                 return;
         }
 
-        vha = sp->vha;
+        vha = sp->fcport->vha;
         req = sp->que;
 
         cmd_pkt->control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(sp));
@@ -234,7 +234,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,
                 return;
         }
 
-        vha = sp->vha;
+        vha = sp->fcport->vha;
         req = sp->que;
 
         cmd_pkt->control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(sp));
@@ -294,7 +294,7 @@ qla2x00_start_scsi(srb_t *sp)
 
         /* Setup device pointers. */
         ret = 0;
-        vha = sp->vha;
+        vha = sp->fcport->vha;
         ha = vha->hw;
         reg = &ha->iobase->isp;
         cmd = sp->cmd;
@@ -353,7 +353,6 @@ qla2x00_start_scsi(srb_t *sp)
         /* Build command packet */
         req->current_outstanding_cmd = handle;
         req->outstanding_cmds[handle] = sp;
-        sp->vha = vha;
         sp->que = req;
         sp->cmd->host_scribble = (unsigned char *)(unsigned long)handle;
         req->cnt -= req_cnt;
@@ -656,7 +655,7 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,
                 return;
         }
 
-        vha = sp->vha;
+        vha = sp->fcport->vha;
         req = sp->que;
 
         /* Set transfer direction */
@@ -723,7 +722,7 @@ qla24xx_start_scsi(srb_t *sp)
         struct req_que *req = NULL;
         struct rsp_que *rsp = NULL;
         struct scsi_cmnd *cmd = sp->cmd;
-        struct scsi_qla_host *vha = sp->vha;
+        struct scsi_qla_host *vha = sp->fcport->vha;
         struct qla_hw_data *ha = vha->hw;
         uint16_t que_id;
 
@@ -791,7 +790,6 @@ qla24xx_start_scsi(srb_t *sp)
         /* Build command packet. */
         req->current_outstanding_cmd = handle;
         req->outstanding_cmds[handle] = sp;
-        sp->vha = vha;
         sp->cmd->host_scribble = (unsigned char *)(unsigned long)handle;
         req->cnt -= req_cnt;