1 files changed, 7 insertions, 4 deletions

diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 7082fe8f83b1..81abc1003aae 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -172,11 +172,14 @@ void __init rd88f5182_pci_preinit(void)
 
 static int __init rd88f5182_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
+        int irq;
+
         /*
-         * PCI-E isn't used on the RD2
+         * Check for devices with hard-wired IRQs.
          */
-        if (dev->bus->number == orion5x_pcie_local_bus_nr())
-                return IRQ_ORION5X_PCIE0_INT;
+        irq = orion5x_pci_map_irq(dev, slot, pin);
+        if (irq != -1)
+                return irq;
 
         /*
          * PCI IRQs are connected via GPIOs
@@ -257,7 +260,7 @@ static void __init rd88f5182_init(void)
         orion5x_setup_dev1_win(RD88F5182_NOR_BASE, RD88F5182_NOR_SIZE);
 
         /*
-         * Open a special address decode windows for the PCIE WA.
+         * Open a special address decode windows for the PCIe WA.
          */
         orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
                                 ORION5X_PCIE_WA_SIZE);