summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAnson Huang <b20788@freescale.com>2011-11-22 18:26:57 +0800
committerJason Liu <r64343@freescale.com>2012-01-09 21:08:05 +0800
commite7c647f7f10285278e5fdd9f934c6c27faec5864 (patch)
tree7564fb5b132ffa507b46e493a660bd64ce8227d7 /arch
parent7a1b75953633f11c468e63fa668c75be54a8f750 (diff)
ENGR00162867 [MX6]Fix pm bug of error coding
Before suspend, we need to check whether there is wakeup source's irq pending via GPC_ISR1~4, previous coding checked for set of irq status of GPC_ISR1, should be GPC_ISR1~4. Signed-off-by: Anson Huang <b20788@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx6/pm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx6/pm.c b/arch/arm/mach-mx6/pm.c
index a93963b566d1..df0f06e76882 100644
--- a/arch/arm/mach-mx6/pm.c
+++ b/arch/arm/mach-mx6/pm.c
@@ -136,11 +136,11 @@ static int mx6_suspend_enter(suspend_state_t state)
wake_irq_isr[0] = __raw_readl(gpc_base +
GPC_ISR1_OFFSET) & gpc_wake_irq[0];
wake_irq_isr[1] = __raw_readl(gpc_base +
- GPC_ISR1_OFFSET) & gpc_wake_irq[1];
+ GPC_ISR2_OFFSET) & gpc_wake_irq[1];
wake_irq_isr[2] = __raw_readl(gpc_base +
- GPC_ISR1_OFFSET) & gpc_wake_irq[2];
+ GPC_ISR3_OFFSET) & gpc_wake_irq[2];
wake_irq_isr[3] = __raw_readl(gpc_base +
- GPC_ISR1_OFFSET) & gpc_wake_irq[3];
+ GPC_ISR4_OFFSET) & gpc_wake_irq[3];
if (wake_irq_isr[0] | wake_irq_isr[1] |
wake_irq_isr[2] | wake_irq_isr[3]) {
printk(KERN_INFO "There are wakeup irq pending,system resume!\n");