diff options
| author | Alex Frid <afrid@nvidia.com> | 2011-07-18 16:20:54 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:47:45 -0800 |
| commit | 67218430b19712154725e3c7a60ab0dfdc3844d5 (patch) | |
| tree | 27c8bf6415a417854d89fd9becd1eaaabacd6363 /arch/arm | |
| parent | 47feb5fd3e468647d5edd4337c3113c5ea9fcc3d (diff) | |
ARM: tegra: clock: Fix activity monitor resume
Move call to clock get rate API (can sleep) outside of activity
monitor resume section protected by spin lock.
Original-Change-Id: I78d5bb8728f3a728a6ff952b1f3cba19b9dec0a0
Reviewed-on: http://git-master/r/41626
Reviewed-by: Narendra Damahe <ndamahe@nvidia.com>
Tested-by: Narendra Damahe <ndamahe@nvidia.com>
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Rebase-Id: R1ab0bb59a88f078f85f125b968546c09aab9d176
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-tegra/tegra3_actmon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra3_actmon.c b/arch/arm/mach-tegra/tegra3_actmon.c index c4a513d58c76..fa9be8ad35e7 100644 --- a/arch/arm/mach-tegra/tegra3_actmon.c +++ b/arch/arm/mach-tegra/tegra3_actmon.c @@ -409,12 +409,12 @@ static void actmon_dev_suspend(struct actmon_dev *dev) static void actmon_dev_resume(struct actmon_dev *dev) { u32 val; - unsigned long flags, freq; + unsigned long flags; + unsigned long freq = clk_get_rate(dev->clk) / 1000; spin_lock_irqsave(&dev->lock, flags); if (dev->state == ACTMON_SUSPENDED) { - freq = clk_get_rate(dev->clk) / 1000; actmon_dev_configure(dev, freq); dev->state = dev->saved_state; if (dev->state == ACTMON_ON) { |