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>

diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index bdaab92063036d7b347166dc9631d41b615875d7..cca3e9fee9a7dd48be455a34590fc88cc59d7b32 100644 (file)
--- 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);
                }
        }