[PATCH V2 06/19] megaraid_sas: Fix goto labels in error handling

[Shivasharan S]

Fix -
During init, if pci_alloc_irq_vectors() fails, the driver has not yet
setup the IRQs. Fix the goto labels and error handling for this case.

Signed-off-by: Shivasharan S <shivasharan.srikanteshw...@broadcom.com>
---
 drivers/scsi/megaraid/megaraid_sas_base.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c 
b/drivers/scsi/megaraid/megaraid_sas_base.c
index 4f4e59db8c56..63ea601e5638 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -5473,7 +5473,7 @@ static int megasas_init_fw(struct megasas_instance 
*instance)
        if (!instance->msix_vectors) {
                i = pci_alloc_irq_vectors(instance->pdev, 1, 1, PCI_IRQ_LEGACY);
                if (i < 0)
-                       goto fail_setup_irqs;
+                       goto fail_init_adapter;
        }
 
        megasas_setup_reply_map(instance);
@@ -5698,9 +5698,8 @@ static int megasas_init_fw(struct megasas_instance 
*instance)
                del_timer_sync(&instance->sriov_heartbeat_timer);
 fail_get_ld_pd_list:
        instance->instancet->disable_intr(instance);
-fail_init_adapter:
        megasas_destroy_irqs(instance);
-fail_setup_irqs:
+fail_init_adapter:
        if (instance->msix_vectors)
                pci_free_irq_vectors(instance->pdev);
        instance->msix_vectors = 0;
-- 
2.16.1