lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lpfc: Remove superfluous call to pci_disable_msix()

Browse Source 
There is no need to call pci_disable_msix() in case
the previous call to pci_enable_msix() failed

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Acked-by: James Smart <james.smart@emulex.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Alexander Gordeev
2014-07-16 20:05:15 +02:00
committed by Christoph Hellwig
parent e85525c39e
commit 029165acfa
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/lpfc/lpfc_init.c
View File

@@ -8242,7 +8242,7 @@ lpfc_sli_enable_msix(struct lpfc_hba *phba)
if (rc) { if (rc) {
lpfc_printf_log(phba, KERN_INFO, LOG_INIT, lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
"0420 PCI enable MSI-X failed (%d)\n", rc); "0420 PCI enable MSI-X failed (%d)\n", rc);
goto msi_fail_out; goto vec_fail_out;
} }
for (i = 0; i < LPFC_MSIX_VECTORS; i++) for (i = 0; i < LPFC_MSIX_VECTORS; i++)
lpfc_printf_log(phba, KERN_INFO, LOG_INIT, lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
@@ -8320,6 +8320,8 @@ irq_fail_out:
msi_fail_out: msi_fail_out:
/* Unconfigure MSI-X capability structure */ /* Unconfigure MSI-X capability structure */
pci_disable_msix(phba->pcidev); pci_disable_msix(phba->pcidev);
vec_fail_out:
return rc; return rc;
} }
@@ -8812,7 +8814,7 @@ enable_msix_vectors:
} else if (rc) { } else if (rc) {
lpfc_printf_log(phba, KERN_INFO, LOG_INIT, lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
"0484 PCI enable MSI-X failed (%d)\n", rc); "0484 PCI enable MSI-X failed (%d)\n", rc);
goto msi_fail_out; goto vec_fail_out;
} }
/* Log MSI-X vector assignment */ /* Log MSI-X vector assignment */
@@ -8875,9 +8877,10 @@ cfg_fail_out:
&phba->sli4_hba.fcp_eq_hdl[index]); &phba->sli4_hba.fcp_eq_hdl[index]);
} }
msi_fail_out:
/* Unconfigure MSI-X capability structure */ /* Unconfigure MSI-X capability structure */
pci_disable_msix(phba->pcidev); pci_disable_msix(phba->pcidev);
vec_fail_out:
return rc; return rc;
} }