diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-19 13:19:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-19 13:19:32 -0700 |
| commit | d0c6f6258478e1dba532bf7c28e2cd6e1047d3a4 (patch) | |
| tree | 1051c0dbd14bcd05b9a17a08b6af1f25b0a9c0d6 /arch/x86/pci | |
| parent | 46ac0cc92eedf92f7909e563ffcd2dbc4b914bc3 (diff) | |
| parent | f82c3d71d6fd2e6a3e3416f09099e29087e39abf (diff) | |
| download | kernel_samsung_tuna-d0c6f6258478e1dba532bf7c28e2cd6e1047d3a4.zip kernel_samsung_tuna-d0c6f6258478e1dba532bf7c28e2cd6e1047d3a4.tar.gz kernel_samsung_tuna-d0c6f6258478e1dba532bf7c28e2cd6e1047d3a4.tar.bz2 | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, pci, mrst: Add extra sanity check in walking the PCI extended cap chain
x86: Fix x2apic preenabled system with kexec
x86: Force HPET readback_cmp for all ATI chipsets
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/mrst.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c index 7ef3a27..cb29191 100644 --- a/arch/x86/pci/mrst.c +++ b/arch/x86/pci/mrst.c @@ -66,8 +66,9 @@ static int fixed_bar_cap(struct pci_bus *bus, unsigned int devfn) devfn, pos, 4, &pcie_cap)) return 0; - if (pcie_cap == 0xffffffff) - return 0; + if (PCI_EXT_CAP_ID(pcie_cap) == 0x0000 || + PCI_EXT_CAP_ID(pcie_cap) == 0xffff) + break; if (PCI_EXT_CAP_ID(pcie_cap) == PCI_EXT_CAP_ID_VNDR) { raw_pci_ext_ops->read(pci_domain_nr(bus), bus->number, @@ -76,7 +77,7 @@ static int fixed_bar_cap(struct pci_bus *bus, unsigned int devfn) return pos; } - pos = pcie_cap >> 20; + pos = PCI_EXT_CAP_NEXT(pcie_cap); } return 0; |