aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2012-09-16 21:44:34 -0400
committerChris Zankel <chris@zankel.net>2012-10-03 18:11:19 -0400
commit33c8213d6930cfa1d09e2912b9e2d59f251c33b7 (patch)
tree79e285ccb3febd50e10f5e309ff3ca2632c16aee /arch/xtensa
parent2e6ee5ec88dd9d4d4e934709200259538160039d (diff)
xtensa: fix xtensa_irq_unmask calls
xtensa_irq_disable/xtensa_irq_enable used to call xtensa_irq_unmask with wrong argument. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/kernel/irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c
index 4340ee076bd..98e77c3ef1c 100644
--- a/arch/xtensa/kernel/irq.c
+++ b/arch/xtensa/kernel/irq.c
@@ -84,12 +84,12 @@ static void xtensa_irq_unmask(struct irq_data *d)
84static void xtensa_irq_enable(struct irq_data *d) 84static void xtensa_irq_enable(struct irq_data *d)
85{ 85{
86 variant_irq_enable(d->irq); 86 variant_irq_enable(d->irq);
87 xtensa_irq_unmask(d->irq); 87 xtensa_irq_unmask(d);
88} 88}
89 89
90static void xtensa_irq_disable(struct irq_data *d) 90static void xtensa_irq_disable(struct irq_data *d)
91{ 91{
92 xtensa_irq_mask(d->irq); 92 xtensa_irq_mask(d);
93 variant_irq_disable(d->irq); 93 variant_irq_disable(d->irq);
94} 94}
95 95