From 23bbbd1646899e8c33ff9a5163bd98de63fec5e5 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Wed, 10 Oct 2012 09:10:32 -0600 Subject: [PATCH] --- yaml --- r: 333233 b: refs/heads/master c: 9dbdfd23b7638d054f3b0e70c64dfb9f297f2a9f h: refs/heads/master i: 333231: 474356d17925fc93653349972f4fc4a758a75714 v: v3 --- [refs] | 2 +- trunk/drivers/vfio/pci/vfio_pci_intrs.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7f639d4629e6..94400565a240 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34002f54d2bd8e8ac04f0da0847f71a8a06a5d38 +refs/heads/master: 9dbdfd23b7638d054f3b0e70c64dfb9f297f2a9f diff --git a/trunk/drivers/vfio/pci/vfio_pci_intrs.c b/trunk/drivers/vfio/pci/vfio_pci_intrs.c index d8dedc7d3910..c8139a598f84 100644 --- a/trunk/drivers/vfio/pci/vfio_pci_intrs.c +++ b/trunk/drivers/vfio/pci/vfio_pci_intrs.c @@ -400,19 +400,20 @@ static int vfio_intx_set_signal(struct vfio_pci_device *vdev, int fd) return PTR_ERR(trigger); } + vdev->ctx[0].trigger = trigger; + if (!vdev->pci_2_3) irqflags = 0; ret = request_irq(pdev->irq, vfio_intx_handler, irqflags, vdev->ctx[0].name, vdev); if (ret) { + vdev->ctx[0].trigger = NULL; kfree(vdev->ctx[0].name); eventfd_ctx_put(trigger); return ret; } - vdev->ctx[0].trigger = trigger; - /* * INTx disable will stick across the new irq setup, * disable_irq won't.