aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2019-12-04 10:15:56 -0700
committerAlex Williamson <alex.williamson@redhat.com>2019-12-04 10:15:56 -0700
commit9917b54aded12dff9beb9e709981617b788e44b0 (patch)
tree8fde9939cdf2aff0bf6b0036cccf406110cc4f99
parent026948f01eac4dda130aa623b7414375633fe7c1 (diff)
parentd567fb8819162099035e546b11a736e29c2af0ea (diff)
download96b-common-9917b54aded12dff9beb9e709981617b788e44b0.tar.gz
Merge branch 'v5.5/vfio/jiang-yi-irq-bypass-unregister-v1' into v5.5/vfio/next
-rw-r--r--drivers/vfio/pci/vfio_pci_intrs.c2
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;