From d3c31a773fa33f78a29bb00ed0dcf8fa55dd4b3a Mon Sep 17 00:00:00 2001 From: Fabio Baltieri Date: Fri, 23 Nov 2012 20:48:08 +0100 Subject: 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 Reviewed-by: Viresh Kumar Signed-off-by: Rafael J. Wysocki --- drivers/cpufreq/cpufreq_ondemand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/cpufreq/cpufreq_ondemand.c') diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index bdaab9206303..cca3e9fee9a7 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); } } -- cgit v1.2.3