diff options
| author |   Alex Williamson <alex.williamson@redhat.com> | 2019-12-04 10:15:56 -0700 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2019-12-04 10:15:56 -0700 |
| commit | 9917b54aded12dff9beb9e709981617b788e44b0 (patch) | |
| tree | 8fde9939cdf2aff0bf6b0036cccf406110cc4f99 /drivers/vfio | |
| parent | vfio/type1: remove hugepage checks in is_invalid_reserved_pfn() (diff) | |
| parent | vfio/pci: call irq_bypass_unregister_producer() before freeing irq (diff) | |
| download | linux-dev-9917b54aded12dff9beb9e709981617b788e44b0.tar.xz linux-dev-9917b54aded12dff9beb9e709981617b788e44b0.zip | |
Merge branch 'v5.5/vfio/jiang-yi-irq-bypass-unregister-v1' into v5.5/vfio/next
Diffstat (limited to 'drivers/vfio')
| -rw-r--r-- | drivers/vfio/pci/vfio_pci_intrs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c index 3fa3f728fb39..2056f3f85f59 100644 --- a/drivers/vfio/pci/vfio_pci_intrs.c +++ b/drivers/vfio/pci/vfio_pci_intrs.c @@ -294,8 +294,8 @@ static int vfio_msi_set_vector_signal(struct vfio_pci_device *vdev, irq = pci_irq_vector(pdev, vector); if (vdev->ctx[vector].trigger) { - free_irq(irq, vdev->ctx[vector].trigger); irq_bypass_unregister_producer(&vdev->ctx[vector].producer); + free_irq(irq, vdev->ctx[vector].trigger); kfree(vdev->ctx[vector].name); eventfd_ctx_put(vdev->ctx[vector].trigger); vdev->ctx[vector].trigger = NULL; |