diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2011-01-10 23:53:12 +0100 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2011-01-14 10:21:06 -0600 |
| commit | 1b624fb64c2de44c00576cc9695680983f05c1ce (patch) | |
| tree | b384179be6bf0aa637b4fb0d496affbb4ead89bd | |
| parent | 57879b8c40d4c254f1feba3adbeb69614fe5e4c9 (diff) | |
| download | linux-1b624fb64c2de44c00576cc9695680983f05c1ce.tar.gz | |
ARM: pxa: fix suspend/resume array index miscalculation
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| -rw-r--r-- | arch/arm/mach-pxa/irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c index 8f947002c0bf..b71677bce548 100644 --- a/arch/arm/mach-pxa/irq.c +++ b/arch/arm/mach-pxa/irq.c @@ -156,7 +156,7 @@ static inline void __iomem *irq_base(int i) 0x40d00130, }; - return (void __iomem *)io_p2v(phys_base[i >> 5]); + return (void __iomem *)io_p2v(phys_base[i]); } void __init pxa_init_irq(int irq_nr, set_wake_t fn) @@ -168,7 +168,7 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn) pxa_internal_irq_nr = irq_nr; for (n = 0; n < irq_nr; n += 32) { - void __iomem *base = irq_base(n); + void __iomem *base = irq_base(n >> 5); __raw_writel(0, base + ICMR); /* disable all IRQs */ __raw_writel(0, base + ICLR); /* all IRQs are IRQ, not FIQ */ @@ -200,7 +200,7 @@ static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state) { int i; - for (i = 0; i < pxa_internal_irq_nr; i += 32) { + for (i = 0; i < pxa_internal_irq_nr / 32; i++) { void __iomem *base = irq_base(i); saved_icmr[i] = __raw_readl(base + ICMR); @@ -219,7 +219,7 @@ static int pxa_irq_resume(struct sys_device *dev) { int i; - for (i = 0; i < pxa_internal_irq_nr; i += 32) { + for (i = 0; i < pxa_internal_irq_nr / 32; i++) { void __iomem *base = irq_base(i); __raw_writel(saved_icmr[i], base + ICMR); |