tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[SCSI] lpfc 8.3.42: Fix WARN_ON when driver unloads

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

authored by James Smart and committed by James Bottomley acbd8616 f5ca6f2e

+8 -2
unified split
+8 -2
drivers/scsi/lpfc/lpfc_init.c
··· 8691 8692 cfg_fail_out: 8693 /* free the irq already requested */ 8694 - for (--index; index >= 0; index--) 8695 free_irq(phba->sli4_hba.msix_entries[index].vector, 8696 &phba->sli4_hba.fcp_eq_hdl[index]); 8697 8698 msi_fail_out: 8699 /* Unconfigure MSI-X capability structure */ ··· 8717 int index; 8718 8719 /* Free up MSI-X multi-message vectors */ 8720 - for (index = 0; index < phba->cfg_fcp_io_channel; index++) 8721 free_irq(phba->sli4_hba.msix_entries[index].vector, 8722 &phba->sli4_hba.fcp_eq_hdl[index]); 8723 8724 /* Disable MSI-X */ 8725 pci_disable_msix(phba->pcidev);
··· 8691 8692 cfg_fail_out: 8693 /* free the irq already requested */ 8694 + for (--index; index >= 0; index--) { 8695 + irq_set_affinity_hint(phba->sli4_hba.msix_entries[index]. 8696 + vector, NULL); 8697 free_irq(phba->sli4_hba.msix_entries[index].vector, 8698 &phba->sli4_hba.fcp_eq_hdl[index]); 8699 + } 8700 8701 msi_fail_out: 8702 /* Unconfigure MSI-X capability structure */ ··· 8714 int index; 8715 8716 /* Free up MSI-X multi-message vectors */ 8717 + for (index = 0; index < phba->cfg_fcp_io_channel; index++) { 8718 + irq_set_affinity_hint(phba->sli4_hba.msix_entries[index]. 8719 + vector, NULL); 8720 free_irq(phba->sli4_hba.msix_entries[index].vector, 8721 &phba->sli4_hba.fcp_eq_hdl[index]); 8722 + } 8723 8724 /* Disable MSI-X */ 8725 pci_disable_msix(phba->pcidev);