diff options
| author | James Smart <james.smart@emulex.com> | 2013-09-06 18:21:19 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-09-11 02:29:21 +0200 |
| commit | acbd86160acdd68946e24a71e608d832c9c9bc1c (patch) | |
| tree | d36929792a18e14866887b133dcc729cdc373ebc /drivers | |
| parent | [SCSI] lpfc 8.3.42: Avoided making pci bar ioremap call during dual-chute WQ/... (diff) | |
| download | linux-acbd86160acdd68946e24a71e608d832c9c9bc1c.tar.xz linux-acbd86160acdd68946e24a71e608d832c9c9bc1c.zip | |
[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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 10 |
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); |