diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-06 17:33:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-06 17:33:54 -0400 |
| commit | ccc0d38ec13d4649d4168c1db590137df53ad783 (patch) | |
| tree | 8512448edfcaeb7a0604a4872a380ff233c1f50a /drivers | |
| parent | f07502dae230a2c3b65381fd1b06e8a18b2c7525 (diff) | |
| parent | 75e613cdc7bb2ba3795b1bc3ddf19476c767ba68 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
x86/pci: fix mmconfig detection with 32bit near 4g
PCI: use fixed-up device class when configuring device
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/probe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index e3c3e081b834..f1ae2475ffff 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
| @@ -745,6 +745,8 @@ int pci_setup_device(struct pci_dev *dev) | |||
| 745 | 745 | ||
| 746 | /* Early fixups, before probing the BARs */ | 746 | /* Early fixups, before probing the BARs */ |
| 747 | pci_fixup_device(pci_fixup_early, dev); | 747 | pci_fixup_device(pci_fixup_early, dev); |
| 748 | /* device class may be changed after fixup */ | ||
| 749 | class = dev->class >> 8; | ||
| 748 | 750 | ||
| 749 | switch (dev->hdr_type) { /* header type */ | 751 | switch (dev->hdr_type) { /* header type */ |
| 750 | case PCI_HEADER_TYPE_NORMAL: /* standard header */ | 752 | case PCI_HEADER_TYPE_NORMAL: /* standard header */ |