Skip to content

Commit 9917b54

Browse files
committed
Merge branch 'v5.5/vfio/jiang-yi-irq-bypass-unregister-v1' into v5.5/vfio/next
2 parents 026948f + d567fb8 commit 9917b54

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/vfio/pci/vfio_pci_intrs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ static int vfio_msi_set_vector_signal(struct vfio_pci_device *vdev,
294294
irq = pci_irq_vector(pdev, vector);
295295

296296
if (vdev->ctx[vector].trigger) {
297-
free_irq(irq, vdev->ctx[vector].trigger);
298297
irq_bypass_unregister_producer(&vdev->ctx[vector].producer);
298+
free_irq(irq, vdev->ctx[vector].trigger);
299299
kfree(vdev->ctx[vector].name);
300300
eventfd_ctx_put(vdev->ctx[vector].trigger);
301301
vdev->ctx[vector].trigger = NULL;

0 commit comments

Comments
 (0)