diff options
author | Hari Kanigeri <h-kanigeri2@ti.com> | 2010-12-22 17:40:37 -0500 |
---|---|---|
committer | Paolo Pisati <paolo.pisati@canonical.com> | 2012-08-17 04:19:10 -0400 |
commit | 4d7c3dffbb84a0abe4a13fda3519c733b5f00300 (patch) | |
tree | dce79788c108c56279f0f577b0616a9b8dcd5a85 | |
parent | be04b0f992370114d53cabd5bd1af8b3662ebdfd (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>
-rw-r--r-- | arch/arm/mach-omap2/remoteproc44xx.c | 8 |
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) | |||
73 | ret = omap_device_shutdown(pdev); | 73 | ret = omap_device_shutdown(pdev); |
74 | if (ret) | 74 | if (ret) |
75 | dev_err(dev, "%s err 0x%x\n", __func__, ret); | 75 | dev_err(dev, "%s err 0x%x\n", __func__, ret); |
76 | } | ||
76 | 77 | ||
77 | if (obj->dmtimer) { | 78 | if (obj->dmtimer) { |
78 | omap_dm_timer_free(obj->dmtimer); | 79 | omap_dm_timer_free(obj->dmtimer); |
79 | obj->dmtimer = NULL; | 80 | obj->dmtimer = NULL; |
80 | } | ||
81 | } | 81 | } |
82 | 82 | ||
83 | obj->state = OMAP_RPROC_STOPPED; | 83 | obj->state = OMAP_RPROC_STOPPED; |