---

yaml --- r: 360047 b: refs/heads/master c: 8cd3d64 h: refs/heads/master i: 360045: cbb6cab 360043: 1e45681 360039: 50102f3 360031: b010cb1 v: v3
git-mirror · Feb 16, 2013 · b4c1e0a · b4c1e0a
1 parent 30a70ca
commit b4c1e0a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e45e542cd742c1c3e30e7f252640644c66548b5
+refs/heads/master: 8cd3d64c5714de7e17eccde48837b329f67bd85e
diff --git a/trunk/arch/mips/pci/pci-xlp.c b/trunk/arch/mips/pci/pci-xlp.c
@@ -64,8 +64,12 @@ static inline u32 pci_cfg_read_32bit(struct pci_bus *bus, unsigned int devfn,
 	u32 data;
 	u32 *cfgaddr;
 
+	where &= ~3;
+	if (bus->number == 0 && PCI_SLOT(devfn) == 1 && where == 0x954)
+		return 0xffffffff;
+
 	cfgaddr = (u32 *)(pci_config_base +
-			pci_cfg_addr(bus->number, devfn, where & ~3));
+			pci_cfg_addr(bus->number, devfn, where));
 	data = *cfgaddr;
 	return data;
 }