From 7f0dbfcbcdef7ca420aa9310ee79afef32e8795d Mon Sep 17 00:00:00 2001
From: Fabio Baltieri <fabio.baltieri@linaro.org>
Date: Fri, 23 Nov 2012 20:48:08 +0100
Subject: [PATCH] --- yaml --- r: 336719 b: refs/heads/master c:
 d3c31a773fa33f78a29bb00ed0dcf8fa55dd4b3a h: refs/heads/master i:   336717:
 d08157fd13ecafea22332ea88ae3f0410224f58c   336715:
 b87311ee8c743cae1126cbdc020b6933b10c8de8   336711:
 f5b9e7f16bb68905b6ab5e30bbfb72bed58fcb65   336703:
 34d14e41a38e6aadba3bdb769eb39ef84ea4d43a v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/cpufreq/cpufreq_ondemand.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6f6ee142e835..db83db4dfb8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5542721a337f3fcfa0585c915827dc391f36fd28
+refs/heads/master: d3c31a773fa33f78a29bb00ed0dcf8fa55dd4b3a
diff --git a/trunk/drivers/cpufreq/cpufreq_ondemand.c b/trunk/drivers/cpufreq/cpufreq_ondemand.c
index bdaab9206303..cca3e9fee9a7 100644
--- a/trunk/drivers/cpufreq/cpufreq_ondemand.c
+++ b/trunk/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);
 		}
 	}