diff options
| author | Doug Zobel <dzobel1@motorola.com> | 2014-03-12 17:13:00 -0500 |
|---|---|---|
| committer | Doug Zobel <dzobel1@motorola.com> | 2014-03-12 17:17:09 -0500 |
| commit | 65f77e4af813eb53b3d69ee7a1e85d662875f6e9 (patch) | |
| tree | 5f066373365eefbb876a3470e6f91eaeb97f03f9 /arch/arm/mach-omap2/pm.c | |
| parent | c6f422aab26b6dc4a4cdfb684203198e165db46e (diff) | |
| download | olio-linux-3.10-65f77e4af813eb53b3d69ee7a1e85d662875f6e9.tar.xz olio-linux-3.10-65f77e4af813eb53b3d69ee7a1e85d662875f6e9.zip | |
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
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 3 |
1 files changed, 3 insertions, 0 deletions
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) |