From 65f77e4af813eb53b3d69ee7a1e85d662875f6e9 Mon Sep 17 00:00:00 2001 From: Doug Zobel Date: Wed, 12 Mar 2014 17:13:00 -0500 Subject: IKXCLOCK-426 omap: pm driver needs to handle suspend abort The omap pm driver does not gracefully handle a kernel suspend abort. If the suspend aborts, the pm driver needs to clear the suspend state by calling omap_prcm_irq_complete(). Change-Id: I012940774a87cd30f822a06211857ad209810347 --- arch/arm/mach-omap2/pm.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm/mach-omap2/pm.c') diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index e742118fcfd..b355841f2b2 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -227,6 +227,9 @@ static int omap_pm_begin(suspend_state_t state) static void omap_pm_end(void) { cpu_idle_poll_ctrl(false); + + if (cpu_is_omap34xx()) + omap_prcm_irq_complete(); } static void omap_pm_finish(void) -- cgit v1.2.3-70-g09d2