Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4850d37d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v3.19-rc4' of git://github.com/awilliam/linux-vfio 

Pull VFIO fix from Alex Williamson:
 "Fix PCI header check in vfio_pci_probe() (Wei Yang)"

* tag 'vfio-v3.19-rc4' of git://github.com/awilliam/linux-vfio:
  vfio-pci: Fix the check on pci device type in vfio_pci_probe()
parents aff8ad59 7c2e211f

drivers/vfio/pci/vfio_pci.c

+1 −3
Original line number Diff line number Diff line
@@ -840,13 +840,11 @@ static const struct vfio_device_ops vfio_pci_ops = { 


static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	u8 type;

	struct vfio_pci_device *vdev;

	struct iommu_group *group;

	int ret;



	pci_read_config_byte(pdev, PCI_HEADER_TYPE, &type);

	if ((type & PCI_HEADER_TYPE) != PCI_HEADER_TYPE_NORMAL)

	if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL)

		return -EINVAL;



	group = iommu_group_get(&pdev->dev);