Merge tag 'omap-for-v4.8/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / arch / arm / mach-imx / irq-common.c

diff --git a/arch/arm/mach-imx/irq-common.c b/arch/arm/mach-imx/irq-common.c
index 0a920d1..210d36e 100644 (file)
--- a/arch/arm/mach-imx/irq-common.c
+++ b/arch/arm/mach-imx/irq-common.c
@@ -33,8 +33,10 @@ int mxc_set_irq_fiq(unsigned int irq, unsigned int type)
        gc = irq_get_chip_data(irq);
        if (gc && gc->private) {
                exirq = gc->private;
-               if (exirq->set_irq_fiq)
-                       ret = exirq->set_irq_fiq(irq, type);
+               if (exirq->set_irq_fiq) {
+                       struct irq_data *d = irq_get_irq_data(irq);
+                       ret = exirq->set_irq_fiq(irqd_to_hwirq(d), type);
+               }
        }
 
        return ret;