diff options
| author | Jeremy.Yao <r65161@freescale.com> | 2010-05-20 13:08:44 +0800 |
|---|---|---|
| committer | Frank Li <Frank.Li@freescale.com> | 2010-05-20 15:19:11 +0800 |
| commit | 149d1d0ec65cc718a341d43e3be9687fb36d84f5 (patch) | |
| tree | 28d91f0b5772e3099f8e8b5ff0653faaff901e04 | |
| parent | a15128d7e048f6e453dcb6ab34cbdae5d1621fc7 (diff) | |
ENGR00123438: iMX23 Mount as usb device then go to standby, system halt
Fix system timer suspend/resume operation in mx23 pm module
Signed-off-by: Jeremy Yao <r65161@freescale.com>
(cherry picked from commit 3975fa294e8cd0cf6174ba35d98266b287787783)
| -rw-r--r-- | arch/arm/mach-mx23/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx23/pm.c b/arch/arm/mach-mx23/pm.c index c44a81f94b5e..0538326f441c 100644 --- a/arch/arm/mach-mx23/pm.c +++ b/arch/arm/mach-mx23/pm.c @@ -280,6 +280,7 @@ static inline void do_standby(void) } local_fiq_disable(); + mxs_nomatch_suspend_timer(); __raw_writel(BM_POWER_CTRL_ENIRQ_PSWITCH, REGS_POWER_BASE + HW_POWER_CTRL_SET); @@ -502,7 +503,6 @@ static suspend_state_t saved_state; static int mx23_pm_begin(suspend_state_t state) { - mxs_nomatch_suspend_timer(); saved_state = state; return 0; } |