diff options
| author | Yu Zhao <yu.zhao@intel.com> | 2009-03-21 15:05:11 +0100 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-03-26 23:50:18 +0100 |
| commit | 853346e4354c948b50a6fb0002f8af2cf5fbf2ae (patch) | |
| tree | b577bc1e79a44c471635559f0bcbfce424309f73 /drivers/pci/probe.c | |
| parent | powerpc/PCI: include pci.h in powerpc MSI implementation (diff) | |
| download | linux-853346e4354c948b50a6fb0002f8af2cf5fbf2ae.tar.xz linux-853346e4354c948b50a6fb0002f8af2cf5fbf2ae.zip | |
PCI: fix conflict between SR-IOV and config space sizing
New pci_cfg_space_size() needs invalid pdev->class, put it in the
right place in the pci_setup_device().
Signed-off-by: Yu Zhao <yu.zhao@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 56c71e585f3d..e2f3dd098cfa 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -713,7 +713,6 @@ int pci_setup_device(struct pci_dev *dev) dev->dev.bus = &pci_bus_type; dev->hdr_type = hdr_type & 0x7f; dev->multifunction = !!(hdr_type & 0x80); - dev->cfg_size = pci_cfg_space_size(dev); dev->error_state = pci_channel_io_normal; set_pcie_port_type(dev); @@ -738,6 +737,9 @@ int pci_setup_device(struct pci_dev *dev) dev_dbg(&dev->dev, "found [%04x:%04x] class %06x header type %02x\n", dev->vendor, dev->device, class, dev->hdr_type); + /* need to have dev->class ready */ + dev->cfg_size = pci_cfg_space_size(dev); + /* "Unknown power state" */ dev->current_state = PCI_UNKNOWN; @@ -959,9 +961,6 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn) return NULL; } - /* need to have dev->class ready */ - dev->cfg_size = pci_cfg_space_size(dev); - return dev; } |