[E1000-devel] [SPAM] [PATCH RFC 41/77] lpfc: Do not call pci_disable_msix() if pci_enable_msix() failed

[Alexander Gordeev]

Signed-off-by: Alexander Gordeev <agord...@redhat.com>
---
 drivers/scsi/lpfc/lpfc_init.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 647f5bf..0803b84 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -8080,7 +8080,7 @@ lpfc_sli_enable_msix(struct lpfc_hba *phba)
        if (rc) {
                lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
                                "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++)
                lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
@@ -8158,6 +8158,8 @@ irq_fail_out:
 msi_fail_out:
        /* Unconfigure MSI-X capability structure */
        pci_disable_msix(phba->pcidev);
+
+vec_fail_out:
        return rc;
 }
 
@@ -8646,7 +8648,7 @@ enable_msix_vectors:
        } else if (rc) {
                lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
                                "0484 PCI enable MSI-X failed (%d)\n", rc);
-               goto msi_fail_out;
+               goto vec_fail_out;
        }
 
        /* Log MSI-X vector assignment */
@@ -8698,9 +8700,10 @@ cfg_fail_out:
                         &phba->sli4_hba.fcp_eq_hdl[index]);
        }
 
-msi_fail_out:
        /* Unconfigure MSI-X capability structure */
        pci_disable_msix(phba->pcidev);
+
+vec_fail_out:
        return rc;
 }
 
-- 
1.7.7.6


------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit 
http://communities.intel.com/community/wired