summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorMax Filippov2012-09-17 03:44:34 +0200
committerChris Zankel2012-10-04 00:11:19 +0200
commit33c8213d6930cfa1d09e2912b9e2d59f251c33b7 (patch)
tree79e285ccb3febd50e10f5e309ff3ca2632c16aee /arch/xtensa
parentxtensa/PCI: fix WT caching attribute (diff)
downloadkernel-qcow2-linux-33c8213d6930cfa1d09e2912b9e2d59f251c33b7.tar.gz
kernel-qcow2-linux-33c8213d6930cfa1d09e2912b9e2d59f251c33b7.tar.xz
kernel-qcow2-linux-33c8213d6930cfa1d09e2912b9e2d59f251c33b7.zip
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 4340ee076bd5..98e77c3ef1c3 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)
static void xtensa_irq_enable(struct irq_data *d)
{
variant_irq_enable(d->irq);
- xtensa_irq_unmask(d->irq);
+ xtensa_irq_unmask(d);
}
static void xtensa_irq_disable(struct irq_data *d)
{
- xtensa_irq_mask(d->irq);
+ xtensa_irq_mask(d);
variant_irq_disable(d->irq);
}