---

yaml --- r: 360083 b: refs/heads/master c: 617fed4 h: refs/heads/master i: 360081: 4d33b63 360079: 980930f v: v3
git-mirror · Feb 17, 2013 · baa79ea · baa79ea
1 parent 0e8b4ed
commit baa79ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15b6dcba427d70e61667c28b45e3f090ff00acb1
+refs/heads/master: 617fed41e98417f3ea3e9974be251e125c8796f2
diff --git a/trunk/arch/mips/ath79/pci.c b/trunk/arch/mips/ath79/pci.c
@@ -75,7 +75,9 @@ int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
 		const struct ath79_pci_irq *entry;
 
 		entry = &ath79_pci_irq_map[i];
-		if (entry->slot == slot && entry->pin == pin) {
+		if (entry->bus == dev->bus->number &&
+		    entry->slot == slot &&
+		    entry->pin == pin) {
 			irq = entry->irq;
 			break;
 		}

diff --git a/trunk/arch/mips/ath79/pci.h b/trunk/arch/mips/ath79/pci.h
@@ -14,6 +14,7 @@
 #define _ATH79_PCI_H
 
 struct ath79_pci_irq {
+	int	bus;
 	u8	slot;
 	u8	pin;
 	int	irq;