Merge branch 'for-4.2/writeback' of git://git.kernel.dk/linux-block

[deliverable/linux.git] / drivers / cpufreq / cpufreq_conservative.c

diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 75f875bb155e58b3a49811160c0d01549d216f67..c86a10c309123c682a571b2ae93c6c2bda6f5394 100644 (file)
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -345,7 +345,6 @@ static int cs_init(struct dbs_data *dbs_data, bool notify)
                cpufreq_register_notifier(&cs_cpufreq_notifier_block,
                                          CPUFREQ_TRANSITION_NOTIFIER);
 
-       mutex_init(&dbs_data->mutex);
        return 0;
 }
 
@@ -370,6 +369,7 @@ static struct common_dbs_data cs_dbs_cdata = {
        .gov_check_cpu = cs_check_cpu,
        .init = cs_init,
        .exit = cs_exit,
+       .mutex = __MUTEX_INITIALIZER(cs_dbs_cdata.mutex),
 };
 
 static int cs_cpufreq_governor_dbs(struct cpufreq_policy *policy,