commit 2907f8442f5750fafbbb9243e088f4a384535236
author Shridhar Rasal <srasal@nvidia.com> Mon Sep 09 19:17:14 2013 +0530
committer Stephen Boyd <sboyd@codeaurora.org> Mon Mar 20 12:16:09 2017 -0700
tree a268b6ca2fb2e9b410d4724b52f08fcc7cdc58cd
parent 17d15c4288fe45f6a010227965033748ae17db28

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>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

drivers/cpufreq/cpufreq_interactive.c

diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c
index 66c096d..d72e8c45 100644
--- a/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@ -1247,6 +1247,8 @@
 			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);