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

Commit acbd8616 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.42: Fix WARN_ON when driver unloads 



Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent f5ca6f2e

drivers/scsi/lpfc/lpfc_init.c

+8 −2
Original line number Diff line number Diff line
@@ -8691,9 +8691,12 @@ lpfc_sli4_enable_msix(struct lpfc_hba *phba) 


cfg_fail_out:

	/* free the irq already requested */

	for (--index; index >= 0; index--)

	for (--index; index >= 0; index--) {

		irq_set_affinity_hint(phba->sli4_hba.msix_entries[index].

					  vector, NULL);

		free_irq(phba->sli4_hba.msix_entries[index].vector,

			 &phba->sli4_hba.fcp_eq_hdl[index]);

	}



msi_fail_out:

	/* Unconfigure MSI-X capability structure */
@@ -8714,9 +8717,12 @@ lpfc_sli4_disable_msix(struct lpfc_hba *phba) 
	int index;



	/* Free up MSI-X multi-message vectors */

	for (index = 0; index < phba->cfg_fcp_io_channel; index++)

	for (index = 0; index < phba->cfg_fcp_io_channel; index++) {

		irq_set_affinity_hint(phba->sli4_hba.msix_entries[index].

					  vector, NULL);

		free_irq(phba->sli4_hba.msix_entries[index].vector,

			 &phba->sli4_hba.fcp_eq_hdl[index]);

	}



	/* Disable MSI-X */

	pci_disable_msix(phba->pcidev);