aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShridhar Rasal <srasal@nvidia.com>2013-09-09 19:17:14 +0530
committerTodd Poynor <toddpoynor@google.com>2013-10-16 16:11:21 -0700
commitb430123367e78a6557bac3cf1558bcb85193fb12 (patch)
treec11999faf60675e6952a3fabba058547d6daf30f
parent65f53ba0525cf92f397b22aea94ee637542a6757 (diff)
downloadlinaro-lsk-b430123367e78a6557bac3cf1558bcb85193fb12.tar.gz
cpufreq: interactive: delete timers for GOV_START
Make sure that timers cpu_timer and cpu_slack_timer deactivated before addition of new. Change-Id: If31c4049606871df6f00efdc24b1d713c86a6f69 Signed-off-by: Shridhar Rasal <srasal@nvidia.com> Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--drivers/cpufreq/cpufreq_interactive.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c
index 66c096dcb1a..d72e8c458f6 100644
--- a/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@ -1247,6 +1247,8 @@ static int cpufreq_governor_interactive(struct cpufreq_policy *policy,
pcpu->hispeed_validate_time =
pcpu->floor_validate_time;
down_write(&pcpu->enable_sem);
+ del_timer_sync(&pcpu->cpu_timer);
+ del_timer_sync(&pcpu->cpu_slack_timer);
cpufreq_interactive_timer_start(tunables, j);
pcpu->governor_enabled = 1;
up_write(&pcpu->enable_sem);