Merge branch 'x86-fixes-for-linus' of...

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, mrst: Don't blindly access extended config space

parents 16a2164b e9b1d5d0

arch/x86/pci/mrst.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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 \|\|