From 4749d3b58177f843cab3d6889f79de53e7da67dd Mon Sep 17 00:00:00 2001 From: James Smart Date: Fri, 3 Aug 2012 12:34:15 -0400 Subject: [PATCH] --- yaml --- r: 328777 b: refs/heads/master c: 21a688cdfa2f48ca9132cf152b0cb7274cb37b98 h: refs/heads/master i: 328775: 1977659625c7458f340a57881ecdefdb6cd9633a v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_mem.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e77b33537380..5bf2df5089a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8cafd38c27cd50f0526c18c6d1b9c756ac3df73 +refs/heads/master: 21a688cdfa2f48ca9132cf152b0cb7274cb37b98 diff --git a/trunk/drivers/scsi/lpfc/lpfc_mem.c b/trunk/drivers/scsi/lpfc/lpfc_mem.c index ade763d3930a..cd86069a0ba8 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_mem.c +++ b/trunk/drivers/scsi/lpfc/lpfc_mem.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 * @@ -194,6 +194,10 @@ lpfc_mem_free(struct lpfc_hba *phba) pci_pool_destroy(phba->lpfc_hbq_pool); phba->lpfc_hbq_pool = NULL; + 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;