1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 18c509fae555..68c55eaa318c 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -3122,7 +3122,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
                 if (vp_idx == 0 && (MSB(stat) != 1))
                         goto reg_needed;
 
-                if (MSB(stat) != 0) {
+                if (MSB(stat) != 0 && MSB(stat) != 2) {
                         ql_dbg(ql_dbg_mbx, vha, 0x10ba,
                             "Could not acquire ID for VP[%d].\n", vp_idx);
                         return;
@@ -3536,7 +3536,7 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)
         if (IS_QLA83XX(ha))
                 mcp->mb[15] = 0;
 
-        reg = (struct device_reg_25xxmq *)((void *)(ha->mqiobase) +
+        reg = (struct device_reg_25xxmq __iomem *)((ha->mqiobase) +
                 QLA_QUE_PAGE * req->id);
 
         mcp->mb[4] = req->id;
@@ -3605,7 +3605,7 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
         if (IS_QLA83XX(ha))
                 mcp->mb[15] = 0;
 
-        reg = (struct device_reg_25xxmq *)((void *)(ha->mqiobase) +
+        reg = (struct device_reg_25xxmq __iomem *)((ha->mqiobase) +
                 QLA_QUE_PAGE * rsp->id);
 
         mcp->mb[4] = rsp->id;