aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/ath79/pci.c
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-02-03 04:58:37 -0500
committerJohn Crispin <blogic@openwrt.org>2013-02-16 19:25:38 -0500
commit617fed41e98417f3ea3e9974be251e125c8796f2 (patch)
treee3298802b42e780342ef72acf1068423fe0fc320 /arch/mips/ath79/pci.c
parent15b6dcba427d70e61667c28b45e3f090ff00acb1 (diff)
MIPS: ath79: allow to specify bus number in PCI IRQ maps
This is needed for multiple PCI bus support. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/4913/ Signed-off-by: John Crispin <blogic@openwrt.org>
Diffstat (limited to 'arch/mips/ath79/pci.c')
-rw-r--r--arch/mips/ath79/pci.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/ath79/pci.c b/arch/mips/ath79/pci.c
index c94bcec169ab..d90e07136383 100644
--- a/arch/mips/ath79/pci.c
+++ b/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)
75 const struct ath79_pci_irq *entry; 75 const struct ath79_pci_irq *entry;
76 76
77 entry = &ath79_pci_irq_map[i]; 77 entry = &ath79_pci_irq_map[i];
78 if (entry->slot == slot && entry->pin == pin) { 78 if (entry->bus == dev->bus->number &&
79 entry->slot == slot &&
80 entry->pin == pin) {
79 irq = entry->irq; 81 irq = entry->irq;
80 break; 82 break;
81 } 83 }