summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-14 09:36:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-14 09:36:10 -0700
commit0be952c13be80ccdd3cb0d1ba25099de9468ac1b (patch)
treec8c02d5240d1ef3b76f3bc9d58ed275a0e8634f5 /drivers
parent9c987a33a864cf405e4c22104508a26197310fd0 (diff)
parentec76f4007079469e86e2e44c3e5d1d11086de9d6 (diff)
downloadlinux-0be952c13be80ccdd3cb0d1ba25099de9468ac1b.tar.bz2
Merge tag 'vfio-v4.0-rc4' of git://github.com/awilliam/linux-vfio
Pull VFIO fix from Alex Williamson: "Add missing break to avoid clobbering ioctl (Alexey Kardashevskiy)" * tag 'vfio-v4.0-rc4' of git://github.com/awilliam/linux-vfio: vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX
Diffstat (limited to 'drivers')
-rw-r--r--drivers/vfio/pci/vfio_pci_intrs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
index f88bfdf5b6a0..2027a27546ef 100644
--- a/drivers/vfio/pci/vfio_pci_intrs.c
+++ b/drivers/vfio/pci/vfio_pci_intrs.c
@@ -868,12 +868,14 @@ int vfio_pci_set_irqs_ioctl(struct vfio_pci_device *vdev, uint32_t flags,
func = vfio_pci_set_err_trigger;
break;
}
+ break;
case VFIO_PCI_REQ_IRQ_INDEX:
switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) {
case VFIO_IRQ_SET_ACTION_TRIGGER:
func = vfio_pci_set_req_trigger;
break;
}
+ break;
}
if (!func)