From 9319a1f7180ac6aabaef25b85bddadc0fffb1081 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 20 May 2013 10:20:21 -0600
Subject: [PATCH] --- yaml --- r: 376079 b: refs/heads/master c:
 f3f011750a18abc389ef1b0d504fbeeacf641919 h: refs/heads/master i:   376077:
 fe4737551cc8715e3795c591d3f7db0741bb1a60   376075:
 18e8ce093381120ed75128a239d03059a0e71c7f   376071:
 eeac0d733a510752f52dda42752cb676497f6db2   376063:
 d9a6e3b35fdb42a4bce5512d317995bf15468243 v: v3

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

diff --git a/[refs] b/[refs]
index 2a70cc778fc2..be1d76920635 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f327e39b4b8f760c331bb2836735be6d83fbf53
+refs/heads/master: f3f011750a18abc389ef1b0d504fbeeacf641919
diff --git a/trunk/arch/x86/pci/mrst.c b/trunk/arch/x86/pci/mrst.c
index 0e0fabf17342..6eb18c42a28a 100644
--- a/trunk/arch/x86/pci/mrst.c
+++ b/trunk/arch/x86/pci/mrst.c
@@ -141,11 +141,6 @@ static int pci_device_update_fixed(struct pci_bus *bus, unsigned int devfn,
  */
 static bool type1_access_ok(unsigned int bus, unsigned int devfn, int reg)
 {
-	if (bus == 0 && (devfn == PCI_DEVFN(2, 0)
-				|| devfn == PCI_DEVFN(0, 0)
-				|| devfn == PCI_DEVFN(3, 0)))
-		return 1;
-
 	/* This is a workaround for A0 LNC bug where PCI status register does
 	 * not have new CAP bit set. can not be written by SW either.
 	 *
@@ -155,7 +150,10 @@ static bool type1_access_ok(unsigned int bus, unsigned int devfn, int reg)
 	 */
 	if (reg >= 0x100 || reg == PCI_STATUS || reg == PCI_HEADER_TYPE)
 		return 0;
-
+	if (bus == 0 && (devfn == PCI_DEVFN(2, 0)
+				|| devfn == PCI_DEVFN(0, 0)
+				|| devfn == PCI_DEVFN(3, 0)))
+		return 1;
 	return 0; /* langwell on others */
 }