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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Oct 2014 16:35:10 +0000 (09:35 -0700)
commit 75554b68ac1e018bca00d68a430b92ada8ab52dd upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/qla2xxx/qla_target.c

index f033b191a022d882a77174675d66b1fce29a99e2..e6884940d1070250971f8263316098e43b218f5d 100644 (file)
@@ -1514,12 +1514,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, "