From: Shridhar Rasal Date: Mon, 9 Sep 2013 13:47:14 +0000 (+0530) Subject: cpufreq: interactive: delete timers for GOV_START X-Git-Tag: firefly_0821_release~2958^2~258 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8fbe05e54b4ceab2e11ca8f7b0a82055e2c29810;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Bharat Nihalani --- diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c index 66c096dcb1a2..d72e8c458f69 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);