diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2010-06-01 09:57:49 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2010-06-01 09:57:49 +0200 |
| commit | 1d61e73ab4c7470833241af888939a7aab2b0354 (patch) | |
| tree | dd714c2428070a7ea2bf807c2821ac75ff13ec55 /arch/x86/pci/mrst.c | |
| parent | arch/x86/kernel: Add missing spin_unlock (diff) | |
| parent | Linux 2.6.35-rc1 (diff) | |
| download | linux-1d61e73ab4c7470833241af888939a7aab2b0354.tar.xz linux-1d61e73ab4c7470833241af888939a7aab2b0354.zip | |
Merge commit 'v2.6.35-rc1' into amd-iommu/2.6.35
Diffstat (limited to 'arch/x86/pci/mrst.c')
| -rw-r--r-- | arch/x86/pci/mrst.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c index 8bf2fcb88d04..7ef3a2735df3 100644 --- a/arch/x86/pci/mrst.c +++ b/arch/x86/pci/mrst.c @@ -109,7 +109,7 @@ static int pci_device_update_fixed(struct pci_bus *bus, unsigned int devfn, decode++; decode = ~(decode - 1); } else { - decode = ~0; + decode = 0; } /* @@ -247,6 +247,10 @@ static void __devinit pci_fixed_bar_fixup(struct pci_dev *dev) u32 size; int i; + /* Must have extended configuration space */ + if (dev->cfg_size < PCIE_CAP_OFFSET + 4) + return; + /* Fixup the BAR sizes for fixed BAR devices and make them unmoveable */ offset = fixed_bar_cap(dev->bus, dev->devfn); if (!offset || PCI_DEVFN(2, 0) == dev->devfn || |