---

yaml --- r: 336719 b: refs/heads/master c: d3c31a7 h: refs/heads/master i: 336717: d08157f 336715: b87311e 336711: f5b9e7f 336703: 34d14e4 v: v3
git-mirror · Nov 23, 2012 · 7f0dbfc · 7f0dbfc
1 parent 0472674
commit 7f0dbfc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 		}
 	}