Skip to content

Commit

Permalink
ARM: pxa: fix suspend/resume array index miscalculation
Browse files Browse the repository at this point in the history
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
  • Loading branch information
Marek Vasut authored and Eric Miao committed Jan 14, 2011
1 parent 57879b8 commit 1b624fb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/arm/mach-pxa/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 */
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 1b624fb

Please sign in to comment.