Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4850d37d3a7c049f7dc3eb09d7ae4e5553ac521b

Authored by Linus Torvalds
2 parents aff8ad59fe 7c2e211f3c
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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()

Showing 1 changed file Side-by-side Diff

drivers/vfio/pci/vfio_pci.c
Diff comments   View file @ 4850d37
... ... @@ -840,13 +840,11 @@
840 840  
841 841 static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
842 842 {
843   - u8 type;
844 843 struct vfio_pci_device *vdev;
845 844 struct iommu_group *group;
846 845 int ret;
847 846  
848   - pci_read_config_byte(pdev, PCI_HEADER_TYPE, &type);
849   - if ((type & PCI_HEADER_TYPE) != PCI_HEADER_TYPE_NORMAL)
  847 + if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL)
850 848 return -EINVAL;
851 849  
852 850 group = iommu_group_get(&pdev->dev);