From 19151e4a5311de6acdcc25ae5065377873a7a5e5 Mon Sep 17 00:00:00 2001
From: Jacob Pan <jacob.jun.pan@linux.intel.com>
Date: Fri, 16 Jul 2010 11:58:26 -0700
Subject: [PATCH] --- yaml --- r: 201050 b: refs/heads/master c:
 f82c3d71d6fd2e6a3e3416f09099e29087e39abf h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/pci/mrst.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6bee09ef8254..5929db4f87fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd19dce7ac07973f700b0f13fb7f94b951414a4c
+refs/heads/master: f82c3d71d6fd2e6a3e3416f09099e29087e39abf
diff --git a/trunk/arch/x86/pci/mrst.c b/trunk/arch/x86/pci/mrst.c
index 7ef3a2735df3..cb29191cee58 100644
--- a/trunk/arch/x86/pci/mrst.c
+++ b/trunk/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;