diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-13 16:33:32 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-13 16:33:32 -0500 |
| commit | f9c15b429a5c82e613d59a32d4f49cea6e9d64eb (patch) | |
| tree | b0862edccf51627ed70b6beaf06baaf2134844ea /drivers/pci/probe.c | |
| parent | 0dcccc5c53c55565a6b1061e1b15894495c7c9b9 (diff) | |
| parent | 1452cd76a97bf7b93a015586dcabc73fd935e692 (diff) | |
Merge branch 'pci/don-sriov' into next
* pci/don-sriov:
PCI: Remove useless "!dev" tests
PCI: Use spec names for SR-IOV capability fields
PCI: Provide method to reduce the number of total VFs supported
PCI: SRIOV control and status via sysfs
PCI: Use is_visible() with boot_vga attribute for pci_dev
PCI: Add pci_device_type to pdev's device struct
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 59cf1ba34936..293af5a6f912 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
| @@ -975,6 +975,7 @@ int pci_setup_device(struct pci_dev *dev) | |||
| 975 | dev->sysdata = dev->bus->sysdata; | 975 | dev->sysdata = dev->bus->sysdata; |
| 976 | dev->dev.parent = dev->bus->bridge; | 976 | dev->dev.parent = dev->bus->bridge; |
| 977 | dev->dev.bus = &pci_bus_type; | 977 | dev->dev.bus = &pci_bus_type; |
| 978 | dev->dev.type = &pci_dev_type; | ||
| 978 | dev->hdr_type = hdr_type & 0x7f; | 979 | dev->hdr_type = hdr_type & 0x7f; |
| 979 | dev->multifunction = !!(hdr_type & 0x80); | 980 | dev->multifunction = !!(hdr_type & 0x80); |
| 980 | dev->error_state = pci_channel_io_normal; | 981 | dev->error_state = pci_channel_io_normal; |