Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 029165ac authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Christoph Hellwig
Browse files

lpfc: Remove superfluous call to pci_disable_msix() 



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

Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Acked-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent e85525c3

drivers/scsi/lpfc/lpfc_init.c

+6 −3
Original line number Diff line number Diff line
@@ -8242,7 +8242,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,
@@ -8320,6 +8320,8 @@ lpfc_sli_enable_msix(struct lpfc_hba *phba) 
msi_fail_out:

	/* Unconfigure MSI-X capability structure */

	pci_disable_msix(phba->pcidev);



vec_fail_out:

	return rc;

}
@@ -8812,7 +8814,7 @@ lpfc_sli4_enable_msix(struct lpfc_hba *phba) 
	} 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 */
@@ -8875,9 +8877,10 @@ lpfc_sli4_enable_msix(struct lpfc_hba *phba) 
			 &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;

}