diff options
| author |   James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-04-12 07:29:17 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-04-12 07:29:17 -0700 |
| commit | 0e1bfea999daa27c801b19617a6ef8b8ec4adc75 (patch) | |
| tree | 891abcb5f7c1607a868486be63c9918d5242ec79 /drivers/scsi/qla2xxx | |
| parent | Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes (diff) | |
| parent | scsi: ipr: do not set DID_PASSTHROUGH on CHECK CONDITION (diff) | |
| download | linux-dev-0e1bfea999daa27c801b19617a6ef8b8ec4adc75.tar.xz linux-dev-0e1bfea999daa27c801b19617a6ef8b8ec4adc75.zip | |
Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi/qla2xxx')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index f28d38e93439..1a0bf7ef0233 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -1160,8 +1160,13 @@ static inline uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha) { struct device_reg_24xx __iomem *reg = &ha->iobase->isp24; + struct device_reg_82xx __iomem *reg82 = &ha->iobase->isp82; - return ((RD_REG_DWORD(®->host_status)) == ISP_REG_DISCONNECT); + if (IS_P3P_TYPE(ha)) + return ((RD_REG_DWORD(®82->host_int)) == ISP_REG_DISCONNECT); + else + return ((RD_REG_DWORD(®->host_status)) == + ISP_REG_DISCONNECT); } /************************************************************************** |