|
@@ -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;
|
|
}
|
|
}
|
|
|
|
|