scsi: megaraid_sas: Fix goto labels in error handling (8a25fa17) · Commits · 戴 / test

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.srikanteshwara@broadcom.com> Signed-off-by:

Martin K. Petersen <martin.petersen@oracle.com>

drivers/scsi/megaraid/megaraid_sas_base.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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 @@ fail_start_watchdog:
		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;

Admin message