summaryrefslogtreecommitdiffstats
path: root/arch/mips/vr41xx/common/irq.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-04-09 10:05:30 +0200
committerTakashi Iwai <tiwai@suse.de>2011-04-09 10:05:30 +0200
commit664cee46e755b37204f1731cb8726db610f3486d (patch)
tree11ed0d43eff14123534785cf25c0a2143e134e7e /arch/mips/vr41xx/common/irq.c
parentMerge branch 'fix/asoc' into for-linus (diff)
parentMerge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff)
downloadlinux-664cee46e755b37204f1731cb8726db610f3486d.tar.xz
linux-664cee46e755b37204f1731cb8726db610f3486d.zip
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'arch/mips/vr41xx/common/irq.c')
-rw-r--r--arch/mips/vr41xx/common/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
index 9ff7f397c0e1..70a3b85f3757 100644
--- a/arch/mips/vr41xx/common/irq.c
+++ b/arch/mips/vr41xx/common/irq.c
@@ -87,7 +87,7 @@ static void irq_dispatch(unsigned int irq)
atomic_inc(&irq_err_count);
else
irq_dispatch(irq);
- if (!(desc->status & IRQ_DISABLED) && chip->irq_unmask)
+ if (!irqd_irq_disabled(idata) && chip->irq_unmask)
chip->irq_unmask(idata);
} else
do_IRQ(irq);