1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 8d491084eb5d..2bafde2b7cfe 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -3324,7 +3324,8 @@ lpfc_mbx_cmpl_read_topology(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 
         /* Unblock ELS traffic */
         pring = lpfc_phba_elsring(phba);
-        pring->flag &= ~LPFC_STOP_IOCB_EVENT;
+        if (pring)
+                pring->flag &= ~LPFC_STOP_IOCB_EVENT;
 
         /* Check for error */
         if (mb->mbxStatus) {
@@ -4981,7 +4982,8 @@ lpfc_nlp_remove(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
         lpfc_cancel_retry_delay_tmo(vport, ndlp);
         if ((ndlp->nlp_flag & NLP_DEFER_RM) &&
             !(ndlp->nlp_flag & NLP_REG_LOGIN_SEND) &&
-            !(ndlp->nlp_flag & NLP_RPI_REGISTERED)) {
+            !(ndlp->nlp_flag & NLP_RPI_REGISTERED) &&
+            phba->sli_rev != LPFC_SLI_REV4) {
                 /* For this case we need to cleanup the default rpi
                  * allocated by the firmware.
                  */
@@ -5429,6 +5431,8 @@ lpfc_free_tx(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
 
         psli = &phba->sli;
         pring = lpfc_phba_elsring(phba);
+        if (unlikely(!pring))
+                return;
 
         /* Error matching iocb on txq or txcmplq
          * First check the txq.