From e59380ef133fc70bc4d71e6614eb902d1beed21d Mon Sep 17 00:00:00 2001 From: Yu Zhao Date: Sat, 21 Mar 2009 22:05:11 +0800 Subject: [PATCH] --- yaml --- r: 139389 b: refs/heads/master c: 853346e4354c948b50a6fb0002f8af2cf5fbf2ae h: refs/heads/master i: 139387: 04031a8ce920cdc9020b57dd55203282cbe65fe3 v: v3 --- [refs] | 2 +- trunk/drivers/pci/probe.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 235c39ba8fdc..c511d92dbc4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ceb93a9ff16612314d757874b6415ffbb2091576 +refs/heads/master: 853346e4354c948b50a6fb0002f8af2cf5fbf2ae diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index 56c71e585f3d..e2f3dd098cfa 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/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; }