From f21aa806d11595a5650dde7931df9b94c99a0db0 Mon Sep 17 00:00:00 2001
From: Ben Slusky <sluskyb@paranoiacs.org>
Date: Mon, 7 Jul 2008 13:16:20 -0400
Subject: [PATCH] --- yaml --- r: 110794 b: refs/heads/master c:
 8217e4f4c93e5fb59bb3cd1e6135213889349f86 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/cpufreq/cpufreq_conservative.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a54184d7d3a8..5398557f5c0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1829e4a371f26430185a9d5b97b8d9d19824e08
+refs/heads/master: 8217e4f4c93e5fb59bb3cd1e6135213889349f86
diff --git a/trunk/drivers/cpufreq/cpufreq_conservative.c b/trunk/drivers/cpufreq/cpufreq_conservative.c
index ac0bbf2d234f..4ee53a4c6d2c 100644
--- a/trunk/drivers/cpufreq/cpufreq_conservative.c
+++ b/trunk/drivers/cpufreq/cpufreq_conservative.c
@@ -460,6 +460,7 @@ static void do_dbs_timer(struct work_struct *work)
 
 static inline void dbs_timer_init(void)
 {
+	init_timer_deferrable(&dbs_work.timer);
 	schedule_delayed_work(&dbs_work,
 			usecs_to_jiffies(dbs_tuners_ins.sampling_rate));
 	return;