summaryrefslogtreecommitdiff
path: root/drivers/cpufreq/cpufreq_ondemand.c
diff options
context:
space:
mode:
authorFabio Baltieri <fabio.baltieri@linaro.org>2012-11-23 19:48:08 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-23 19:48:08 (GMT)
commitd3c31a773fa33f78a29bb00ed0dcf8fa55dd4b3a (patch)
treeef6e2939a1a4c7eceed419208c2ea886b72696b4 /drivers/cpufreq/cpufreq_ondemand.c
parent5542721a337f3fcfa0585c915827dc391f36fd28 (diff)
downloadlinux-d3c31a773fa33f78a29bb00ed0dcf8fa55dd4b3a.tar.xz
cpufreq: ondemand: fix wrong delay sampling rate
Restore the correct delay value for ondemand's od_dbs_timer, as it was changed erroneously in commit 83f0e55 (cpufreq: governors: remove redundant code). Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org> Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq/cpufreq_ondemand.c')
-rw-r--r--drivers/cpufreq/cpufreq_ondemand.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index bdaab92..cca3e9f 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -234,7 +234,8 @@ static void od_dbs_timer(struct work_struct *work)
dbs_info->sample_type = OD_SUB_SAMPLE;
delay = dbs_info->freq_hi_jiffies;
} else {
- delay = delay_for_sampling_rate(dbs_info->rate_mult);
+ delay = delay_for_sampling_rate(od_tuners.sampling_rate
+ * dbs_info->rate_mult);
}
}