summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorArun Easi <arun.easi@qlogic.com>2014-09-25 06:14:45 -0400
committerChristoph Hellwig <hch@lst.de>2014-09-25 14:25:06 +0200
commit75554b68ac1e018bca00d68a430b92ada8ab52dd (patch)
treef7bd88a1e2e310938ab422fcb621ce3aa98df814 /drivers/scsi
parent78c2106a50e067f7168ee8c0944baaeb0e988272 (diff)
downloadlinux-75554b68ac1e018bca00d68a430b92ada8ab52dd.tar.gz
linux-75554b68ac1e018bca00d68a430b92ada8ab52dd.tar.bz2
linux-75554b68ac1e018bca00d68a430b92ada8ab52dd.zip
qla2xxx: Use correct offset to req-q-out for reserve calculation
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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/qla2xxx/qla_target.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 43f91778371b..2fe6da3c03bb 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -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, "