From 813bfae0bfef3ece6ab43126c9aa9337fe2f9c51 Mon Sep 17 00:00:00 2001 From: James Smart Date: Thu, 1 Mar 2012 22:36:15 -0500 Subject: [PATCH] --- yaml --- r: 298249 b: refs/heads/master c: 0a8a86facf359147b2d3ef796496a09b21984b03 h: refs/heads/master i: 298247: 5431d42f073d8a75c9aaa160288e08767d1c681e v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_nportdisc.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9cddf1ff0e60..d5f040f79b70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fcb8acd6cb1529c596c274a6d375cbe9a134dcb +refs/heads/master: 0a8a86facf359147b2d3ef796496a09b21984b03 diff --git a/trunk/drivers/scsi/lpfc/lpfc_nportdisc.c b/trunk/drivers/scsi/lpfc/lpfc_nportdisc.c index 7b6b2aa5795a..cc5dcd9e7d24 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_nportdisc.c +++ b/trunk/drivers/scsi/lpfc/lpfc_nportdisc.c @@ -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;