diff options
| author | Shridhar Rasal <srasal@nvidia.com> | 2013-09-09 19:17:14 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-16 11:58:53 -0700 |
| commit | 4491e4633e3028c81a6e483dc0ed748341ff1bcd (patch) | |
| tree | 14d8484c51b6c24fa4c2b8e5fafcd2b583f7a2f4 /drivers/cpufreq | |
| parent | 5257a97a86766bdc3a976e3278b65367f35f9ff8 (diff) | |
cpufreq: interactive: delete timers for GOV_START
Make sure that timers cpu_timer and cpu_slack_timer
deactivated before addition of new.
bug 1362600
Change-Id: If31c4049606871df6f00efdc24b1d713c86a6f69
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/274418
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq_interactive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c index b1d99933397d..7bbd074233de 100644 --- a/drivers/cpufreq/cpufreq_interactive.c +++ b/drivers/cpufreq/cpufreq_interactive.c @@ -1102,6 +1102,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(j); pcpu->governor_enabled = 1; up_write(&pcpu->enable_sem); |