diff --git a/[refs] b/[refs] index b5af8c9b7524..6fe45b172d9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 917d853564530dd5e73c8c1604e823465ff9b713 +refs/heads/master: 24469df4ed8943104980fa7405011870ede8105a diff --git a/trunk/arch/arm/mach-prima2/pm.c b/trunk/arch/arm/mach-prima2/pm.c index 0ba39f3e16ba..cb53160f6c5d 100644 --- a/trunk/arch/arm/mach-prima2/pm.c +++ b/trunk/arch/arm/mach-prima2/pm.c @@ -71,6 +71,7 @@ static int sirfsoc_pm_enter(suspend_state_t state) outer_disable(); /* go zzz */ cpu_suspend(0, sirfsoc_finish_suspend); + outer_resume(); break; default: return -EINVAL;