[PATCH 4.6 050/121] Revert "lpfc: Delete unnecessary checks before the function call mempool_destroy"

[Greg Kroah-Hartman]

4.6-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Martin K. Petersen <martin.peter...@oracle.com>

commit d65c8fff867a6450c58ce31572e883148a445ddf upstream.

This reverts commit 9be321819c43417432a8376428b90fe3fe3a3510 which
caused a regression on hardware using the SLI3 interface.

Reported-by: Dick Kennedy <dick.kenn...@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.peter...@oracle.com>
Signed-off-by: James Bottomley <j...@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/scsi/lpfc/lpfc_mem.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- a/drivers/scsi/lpfc/lpfc_mem.c
+++ b/drivers/scsi/lpfc/lpfc_mem.c
@@ -231,13 +231,15 @@ lpfc_mem_free(struct lpfc_hba *phba)
        if (phba->lpfc_hbq_pool)
                pci_pool_destroy(phba->lpfc_hbq_pool);
        phba->lpfc_hbq_pool = NULL;
-       mempool_destroy(phba->rrq_pool);
+
+       if (phba->rrq_pool)
+               mempool_destroy(phba->rrq_pool);
        phba->rrq_pool = NULL;
 
        /* Free NLP memory pool */
        mempool_destroy(phba->nlp_mem_pool);
        phba->nlp_mem_pool = NULL;
-       if (phba->sli_rev == LPFC_SLI_REV4) {
+       if (phba->sli_rev == LPFC_SLI_REV4 && phba->active_rrq_pool) {
                mempool_destroy(phba->active_rrq_pool);
                phba->active_rrq_pool = NULL;
        }