1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 7b6b2aa5795a..15ca2a9a0cdd 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -1,7 +1,7 @@
  /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2009 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -440,11 +440,15 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                 spin_unlock_irq(shost->host_lock);
                 stat.un.b.lsRjtRsnCode = LSRJT_INVALID_CMD;
                 stat.un.b.lsRjtRsnCodeExp = LSEXP_NOTHING_MORE;
-                lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb,
+                rc = lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb,
                         ndlp, mbox);
+                if (rc)
+                        mempool_free(mbox, phba->mbox_mem_pool);
                 return 1;
         }
-        lpfc_els_rsp_acc(vport, ELS_CMD_PLOGI, cmdiocb, ndlp, mbox);
+        rc = lpfc_els_rsp_acc(vport, ELS_CMD_PLOGI, cmdiocb, ndlp, mbox);
+        if (rc)
+                mempool_free(mbox, phba->mbox_mem_pool);
         return 1;
 out:
         stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;