Merge tag 'sound-fix-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / omap-wakeupgen.c

diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
index 3664562f91481e76487ff77ef8e133ccd7edfaab..693fe486e9172d987879655efc799b531d01bd34 100644 (file)
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
@@ -138,7 +138,7 @@ static void wakeupgen_mask(struct irq_data *d)
        unsigned long flags;
 
        raw_spin_lock_irqsave(&wakeupgen_lock, flags);
-       _wakeupgen_clear(d->irq, irq_target_cpu[d->irq]);
+       _wakeupgen_clear(d->hwirq, irq_target_cpu[d->hwirq]);
        raw_spin_unlock_irqrestore(&wakeupgen_lock, flags);
 }
 
@@ -150,7 +150,7 @@ static void wakeupgen_unmask(struct irq_data *d)
        unsigned long flags;
 
        raw_spin_lock_irqsave(&wakeupgen_lock, flags);
-       _wakeupgen_set(d->irq, irq_target_cpu[d->irq]);
+       _wakeupgen_set(d->hwirq, irq_target_cpu[d->hwirq]);
        raw_spin_unlock_irqrestore(&wakeupgen_lock, flags);
 }