diff options
| author | James Smart <james.smart@emulex.com> | 2012-09-29 11:29:29 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-10-08 11:51:45 +0100 |
| commit | 8831881644a37a24dbdaf6c9b16a4010f212fb44 (patch) | |
| tree | 6a518fa1b52bef6593241e5e90af13c6cd0b9ece /drivers/scsi | |
| parent | 005ffa704431a8d98ad313d4fa285a5d9bce37bc (diff) | |
| download | linux-3.10-8831881644a37a24dbdaf6c9b16a4010f212fb44.tar.gz linux-3.10-8831881644a37a24dbdaf6c9b16a4010f212fb44.tar.bz2 linux-3.10-8831881644a37a24dbdaf6c9b16a4010f212fb44.zip | |
[SCSI] lpfc 8.3.35: Correct missing queue destroy on function reset
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index ee804e726b8..f4ab975985a 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -3964,9 +3964,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); |