1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 785c61279e6e..51716c7e3008 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -359,7 +359,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
         scsi_qla_host_t *base_vha = shost_priv(fc_vport->shost);
         struct qla_hw_data *ha = base_vha->hw;
         scsi_qla_host_t *vha;
-        struct scsi_host_template *sht = &qla24xx_driver_template;
+        struct scsi_host_template *sht = &qla2xxx_driver_template;
         struct Scsi_Host *host;
 
         vha = qla2x00_create_host(sht, ha);
@@ -584,6 +584,7 @@ qla25xx_create_req_que(struct qla_hw_data *ha, uint16_t options,
         struct req_que *req = NULL;
         struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
         uint16_t que_id = 0;
+        device_reg_t __iomem *reg;
 
         req = kzalloc(sizeof(struct req_que), GFP_KERNEL);
         if (req == NULL) {
@@ -631,6 +632,9 @@ qla25xx_create_req_que(struct qla_hw_data *ha, uint16_t options,
         req->ring_index = 0;
         req->cnt = req->length;
         req->id = que_id;
+        reg = ISP_QUE_REG(ha, que_id);
+        req->req_q_in = &reg->isp25mq.req_q_in;
+        req->req_q_out = &reg->isp25mq.req_q_out;
         req->max_q_depth = ha->req_q_map[0]->max_q_depth;
         mutex_unlock(&ha->vport_lock);
 
@@ -658,7 +662,8 @@ qla25xx_create_rsp_que(struct qla_hw_data *ha, uint16_t options,
         int ret = 0;
         struct rsp_que *rsp = NULL;
         struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
-        uint16_t que_id = 0;;
+        uint16_t que_id = 0;
+        device_reg_t __iomem *reg;
 
         rsp = kzalloc(sizeof(struct rsp_que), GFP_KERNEL);
         if (rsp == NULL) {
@@ -706,6 +711,9 @@ qla25xx_create_rsp_que(struct qla_hw_data *ha, uint16_t options,
         rsp->ring_ptr = rsp->ring;
         rsp->ring_index = 0;
         rsp->id = que_id;
+        reg = ISP_QUE_REG(ha, que_id);
+        rsp->rsp_q_in = &reg->isp25mq.rsp_q_in;
+        rsp->rsp_q_out = &reg->isp25mq.rsp_q_out;
         mutex_unlock(&ha->vport_lock);
 
         ret = qla25xx_request_irq(rsp);