summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDomen Puncer <domen.puncer@telargo.com>2007-04-11 00:27:49 +0200
committerPaul Mackerras <paulus@samba.org>2007-04-11 18:39:58 +0200
commit22132178b26c907d19f661a4ae7fd265962d417e (patch)
tree19d793af155047b56dfc0b910dc26f1cf3b65bab /arch
parent[PATCH] FRV: Update the FRV arch MAINTAINER record to get a hit on "grep -i frv" (diff)
downloadlinux-22132178b26c907d19f661a4ae7fd265962d417e.tar.xz
linux-22132178b26c907d19f661a4ae7fd265962d417e.zip
[POWERPC] mpc52xx_pic: fix main interrupt masking
The bit setting was off by one. Tested with RTC and GPIO_WKUP interrupts. Signed-off-by: Domen Puncer <domen.puncer@telargo.com> Signed-off-by: Sylvain Munaut <tnt@246tNt.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_pic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index c75192567e55..fbfff95b4437 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -128,7 +128,7 @@ static void mpc52xx_main_mask(unsigned int virq)
pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
- io_be_setbit(&intr->main_mask, 15 - l2irq);
+ io_be_setbit(&intr->main_mask, 16 - l2irq);
}
static void mpc52xx_main_unmask(unsigned int virq)
@@ -141,7 +141,7 @@ static void mpc52xx_main_unmask(unsigned int virq)
pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
- io_be_clrbit(&intr->main_mask, 15 - l2irq);
+ io_be_clrbit(&intr->main_mask, 16 - l2irq);
}
static struct irq_chip mpc52xx_main_irqchip = {