summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorHari Kanigeri <h-kanigeri2@ti.com>2011-05-31 09:24:30 +0100
committerAndy Green <andy.green@linaro.org>2011-05-31 11:05:58 +0100
commitda78267c303ea41bee7157c06903cd0a45b8aabf (patch)
tree1b8944d1c61ded49dfdf502a007db586bee936eb /arch
parentc4cc63638ce40ca8d666b92df417d06dd6282f12 (diff)
OMAP: rproc44xx: free dmtimer in proc stop case
The current code is freeing dmtimer in proc stop only if the proc state is in RUNNING. But the proc stop could be called when the proc state is HIBERNATION. The fix is to free dmtimer without any check Change-Id: Ib9efbb38b8973f688013f3a8f4a94cae1469e390 Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/remoteproc44xx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/remoteproc44xx.c b/arch/arm/mach-omap2/remoteproc44xx.c
index d487a0f3a5d..f87a2809716 100644
--- a/arch/arm/mach-omap2/remoteproc44xx.c
+++ b/arch/arm/mach-omap2/remoteproc44xx.c
@@ -73,11 +73,11 @@ static inline int proc44x_stop(struct device *dev)
ret = omap_device_shutdown(pdev);
if (ret)
dev_err(dev, "%s err 0x%x\n", __func__, ret);
+ }
- if (obj->dmtimer) {
- omap_dm_timer_free(obj->dmtimer);
- obj->dmtimer = NULL;
- }
+ if (obj->dmtimer) {
+ omap_dm_timer_free(obj->dmtimer);
+ obj->dmtimer = NULL;
}
obj->state = OMAP_RPROC_STOPPED;