Merge tag 'vfio-v4.0-rc4' of git://github.com/awilliam/linux-vfio

torvalds · torvalds · commit 0be952c13be8 · 2015-03-14T09:36:10.000-07:00
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
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -868,12 +868,14 @@ int vfio_pci_set_irqs_ioctl(struct vfio_pci_device *vdev, uint32_t flags,`
`868`	`868`	`func = vfio_pci_set_err_trigger;`
`869`	`869`	`break;`
`870`	`870`	`}`
	`871`	`+ break;`
`871`	`872`	`case VFIO_PCI_REQ_IRQ_INDEX:`
`872`	`873`	`switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) {`
`873`	`874`	`case VFIO_IRQ_SET_ACTION_TRIGGER:`
`874`	`875`	`func = vfio_pci_set_req_trigger;`
`875`	`876`	`break;`
`876`	`877`	`}`
	`878`	`+ break;`
`877`	`879`	`}`
`878`	`880`
`879`	`881`	`if (!func)`