diff options
author | James Smart <james.smart@emulex.com> | 2012-08-03 12:34:15 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-09-14 09:31:50 -0400 |
commit | 21a688cdfa2f48ca9132cf152b0cb7274cb37b98 (patch) | |
tree | 09060c0bb20367ab8a7b46d998bd4530c39001b7 | |
parent | f8cafd38c27cd50f0526c18c6d1b9c756ac3df73 (diff) |
[SCSI] lpfc 8.3.33: Fix bug with rrq_pool not being destroyed during driver removal.
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r-- | drivers/scsi/lpfc/lpfc_mem.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c index ade763d3930a..cd86069a0ba8 100644 --- a/drivers/scsi/lpfc/lpfc_mem.c +++ b/drivers/scsi/lpfc/lpfc_mem.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /******************************************************************* | 1 | /******************************************************************* |
2 | * This file is part of the Emulex Linux Device Driver for * | 2 | * This file is part of the Emulex Linux Device Driver for * |
3 | * Fibre Channel Host Bus Adapters. * | 3 | * Fibre Channel Host Bus Adapters. * |
4 | * Copyright (C) 2004-2009 Emulex. All rights reserved. * | 4 | * Copyright (C) 2004-2012 Emulex. All rights reserved. * |
5 | * EMULEX and SLI are trademarks of Emulex. * | 5 | * EMULEX and SLI are trademarks of Emulex. * |
6 | * www.emulex.com * | 6 | * www.emulex.com * |
7 | * Portions Copyright (C) 2004-2005 Christoph Hellwig * | 7 | * Portions Copyright (C) 2004-2005 Christoph Hellwig * |
@@ -194,6 +194,10 @@ lpfc_mem_free(struct lpfc_hba *phba) | |||
194 | pci_pool_destroy(phba->lpfc_hbq_pool); | 194 | pci_pool_destroy(phba->lpfc_hbq_pool); |
195 | phba->lpfc_hbq_pool = NULL; | 195 | phba->lpfc_hbq_pool = NULL; |
196 | 196 | ||
197 | if (phba->rrq_pool) | ||
198 | mempool_destroy(phba->rrq_pool); | ||
199 | phba->rrq_pool = NULL; | ||
200 | |||
197 | /* Free NLP memory pool */ | 201 | /* Free NLP memory pool */ |
198 | mempool_destroy(phba->nlp_mem_pool); | 202 | mempool_destroy(phba->nlp_mem_pool); |
199 | phba->nlp_mem_pool = NULL; | 203 | phba->nlp_mem_pool = NULL; |