diff options
| author | Vinod Koul <vkoul@kernel.org> | 2021-07-15 17:53:57 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2021-07-15 17:53:57 +0530 |
| commit | 407b3ea075c2733d6eeb85de9aa33eecd1ff0fb9 (patch) | |
| tree | fbc1acce848c115c8dd13e683f7a131bb38240ba /drivers/dma/idxd | |
| parent | 4faee8b65ec32346f8096e64c5fa1d5a73121742 (diff) | |
| parent | d5c10e0fc8645342fe5c9796b00c84ab078cd713 (diff) | |
Merge branch 'fixes' into next
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/dma/idxd')
| -rw-r--r-- | drivers/dma/idxd/init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c index de300ba38b14..7eac0d167bde 100644 --- a/drivers/dma/idxd/init.c +++ b/drivers/dma/idxd/init.c @@ -102,6 +102,8 @@ static int idxd_setup_interrupts(struct idxd_device *idxd) spin_lock_init(&idxd->irq_entries[i].list_lock); } + idxd_msix_perm_setup(idxd); + irq_entry = &idxd->irq_entries[0]; rc = request_threaded_irq(irq_entry->vector, NULL, idxd_misc_thread, 0, "idxd-misc", irq_entry); @@ -148,7 +150,6 @@ static int idxd_setup_interrupts(struct idxd_device *idxd) } idxd_unmask_error_interrupts(idxd); - idxd_msix_perm_setup(idxd); return 0; err_wq_irqs: @@ -162,6 +163,7 @@ static int idxd_setup_interrupts(struct idxd_device *idxd) err_misc_irq: /* Disable error interrupt generation */ idxd_mask_error_interrupts(idxd); + idxd_msix_perm_clear(idxd); err_irq_entries: pci_free_irq_vectors(pdev); dev_err(dev, "No usable interrupts\n"); |