From: James Smart Date: Mon, 26 Nov 2012 22:50:31 +0000 (-0700) Subject: [SCSI] lpfc 8.3.35: Correct missing queue destroy on function reset X-Git-Tag: v2.6.39-400.9.0~47^2~11 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8b04575128351b95d39c99c90284823a31392a0f;p=users%2Fjedix%2Flinux-maple.git [SCSI] lpfc 8.3.35: Correct missing queue destroy on function reset Signed-off-by: James Smart Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index eb1eafb78f38..da34c779a958 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -3919,9 +3919,9 @@ lpfc_sli4_brdreset(struct lpfc_hba *phba) pci_write_config_word(phba->pcidev, PCI_COMMAND, (cfg_value & ~(PCI_COMMAND_PARITY | PCI_COMMAND_SERR))); - /* Perform FCoE PCI function reset */ - lpfc_sli4_queue_destroy(phba); + /* Perform FCoE PCI function reset before freeing queue memory */ rc = lpfc_pci_function_reset(phba); + lpfc_sli4_queue_destroy(phba); /* Restore PCI cmd register */ pci_write_config_word(phba->pcidev, PCI_COMMAND, cfg_value);