[SCSI] qla2xxx: Query supported RISC registers bits in determining a paused-state.

ISP24xx and above must query the host-status register, not HCCR.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

2 files changed, 2 insertions, 5 deletions

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 68671a2b8b7f..4a990f4da4ea 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -149,11 +149,9 @@ qla24xx_pause_risc(struct device_reg_24xx __iomem *reg)
         int rval = QLA_SUCCESS;
         uint32_t cnt;
 
-        if (RD_REG_DWORD(&reg->hccr) & HCCRX_RISC_PAUSE)
-                return rval;
-
         WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_PAUSE);
-        for (cnt = 30000; (RD_REG_DWORD(&reg->hccr) & HCCRX_RISC_PAUSE) == 0 &&
+        for (cnt = 30000;
+            ((RD_REG_DWORD(&reg->host_status) & HSRX_RISC_PAUSED) == 0) &&
             rval == QLA_SUCCESS; cnt--) {
                 if (cnt)
                         udelay(100);
diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
index 9e56d4a4cb75..dfde2dd865cb 100644
--- a/drivers/scsi/qla2xxx/qla_fw.h
+++ b/drivers/scsi/qla2xxx/qla_fw.h
@@ -878,7 +878,6 @@ struct device_reg_24xx {
                                         /* HCCR statuses. */
 #define HCCRX_HOST_INT          BIT_6   /* Host to RISC interrupt bit. */
 #define HCCRX_RISC_RESET        BIT_5   /* RISC Reset mode bit. */
-#define HCCRX_RISC_PAUSE        BIT_4   /* RISC Pause mode bit. */
                                         /* HCCR commands. */
                                         /* NOOP. */
 #define HCCRX_NOOP              0x00000000