OSDN Git Service

qla2xxx: Use correct offset to req-q-out for reserve calculation
authorArun Easi <arun.easi@qlogic.com>
Thu, 25 Sep 2014 10:14:45 +0000 (06:14 -0400)
committerChristoph Hellwig <hch@lst.de>
Thu, 25 Sep 2014 12:25:06 +0000 (14:25 +0200)
Cc: <stable@vger.kernel.org>
Signed-off-by: Arun Easi <arun.easi@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/scsi/qla2xxx/qla_target.c

index 43f9177..2fe6da3 100644 (file)
@@ -1431,12 +1431,10 @@ static inline void qlt_unmap_sg(struct scsi_qla_host *vha,
 static int qlt_check_reserve_free_req(struct scsi_qla_host *vha,
        uint32_t req_cnt)
 {
-       struct qla_hw_data *ha = vha->hw;
-       device_reg_t __iomem *reg = ha->iobase;
        uint32_t cnt;
 
        if (vha->req->cnt < (req_cnt + 2)) {
-               cnt = (uint16_t)RD_REG_DWORD(&reg->isp24.req_q_out);
+               cnt = (uint16_t)RD_REG_DWORD(vha->req->req_q_out);
 
                ql_dbg(ql_dbg_tgt, vha, 0xe00a,
                    "Request ring circled: cnt=%d, vha->->ring_index=%d, "