[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>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 6e5a735702d3..c6f1333476fd 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -8691,9 +8691,12 @@ enable_msix_vectors:
 
 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);