1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index 4775baa8b6a0..80867599527d 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -695,11 +695,11 @@ qlafx00_pci_info_str(struct scsi_qla_host *vha, char *str)
 }
 
 char *
-qlafx00_fw_version_str(struct scsi_qla_host *vha, char *str)
+qlafx00_fw_version_str(struct scsi_qla_host *vha, char *str, size_t size)
 {
         struct qla_hw_data *ha = vha->hw;
 
-        sprintf(str, "%s", ha->mr.fw_version);
+        snprintf(str, size, "%s", ha->mr.fw_version);
         return str;
 }
 
@@ -1551,7 +1551,10 @@ qlafx00_timer_routine(scsi_qla_host_t *vha)
                         ha->mr.fw_reset_timer_tick =
                             QLAFX00_MAX_RESET_INTERVAL;
                 }
-                ha->mr.old_aenmbx0_state = aenmbx0;
+                if (ha->mr.old_aenmbx0_state != aenmbx0) {
+                        ha->mr.old_aenmbx0_state = aenmbx0;
+                        ha->mr.fw_reset_timer_tick = QLAFX00_RESET_INTERVAL;
+                }
                 ha->mr.fw_reset_timer_tick--;
         }
         if (test_bit(FX00_CRITEMP_RECOVERY, &vha->dpc_flags)) {
@@ -1675,17 +1678,16 @@ qlafx00_get_fcport(struct scsi_qla_host *vha, int tgt_id)
         fc_port_t       *fcport;
 
         /* Check for matching device in remote port list. */
-        fcport = NULL;
         list_for_each_entry(fcport, &vha->vp_fcports, list) {
                 if (fcport->tgt_id == tgt_id) {
                         ql_dbg(ql_dbg_async, vha, 0x5072,
                             "Matching fcport(%p) found with TGT-ID: 0x%x "
                             "and Remote TGT_ID: 0x%x\n",
                             fcport, fcport->tgt_id, tgt_id);
-                        break;
+                        return fcport;
                 }
         }
-        return fcport;
+        return NULL;
 }
 
 static void
@@ -2924,7 +2926,7 @@ qlafx00_intr_handler(int irq, void *dev_id)
         vha = pci_get_drvdata(ha->pdev);
         for (iter = 50; iter--; clr_intr = 0) {
                 stat = QLAFX00_RD_INTR_REG(ha);
-                if (qla2x00_check_reg_for_disconnect(vha, stat))
+                if (qla2x00_check_reg32_for_disconnect(vha, stat))
                         break;
                 intr_stat = stat & QLAFX00_HST_INT_STS_BITS;
                 if (!intr_stat)