From 74ef8cf58d95c6e7d3a88a8f6c54b70d0fa4af49 Mon Sep 17 00:00:00 2001 From: Fabio Baltieri Date: Thu, 27 Dec 2012 14:55:42 +0000 Subject: [PATCH] --- yaml --- r: 351007 b: refs/heads/master c: 8ee2ec51d0916b8c8c4387fb6da5904900ef6b98 h: refs/heads/master i: 351005: 4f3e24b05dcfb599e0c81c768a75112dc57780de 351003: 5daec27d9c5d500bb01ad48401aed230f1ce938d 350999: c91cc171d083372feddcb7fd919a15e8b679388a 350991: 20c3b51e74cf0cd2c0554409935780d6294cad0d 350975: dec9faab4845dd47cb1f9561a98312f132193151 v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/cpufreq_ondemand.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2409c4815817..1b65b42bd001 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66df2a01dfd715636f5c86f7afd05362e7e3fddd +refs/heads/master: 8ee2ec51d0916b8c8c4387fb6da5904900ef6b98 diff --git a/trunk/drivers/cpufreq/cpufreq_ondemand.c b/trunk/drivers/cpufreq/cpufreq_ondemand.c index 13ceb3c69b64..1017b90b902e 100644 --- a/trunk/drivers/cpufreq/cpufreq_ondemand.c +++ b/trunk/drivers/cpufreq/cpufreq_ondemand.c @@ -326,7 +326,7 @@ static void update_sampling_rate(unsigned int new_rate) cpufreq_cpu_put(policy); continue; } - dbs_info = &per_cpu(od_cpu_dbs_info, policy->cpu); + dbs_info = &per_cpu(od_cpu_dbs_info, cpu); cpufreq_cpu_put(policy); mutex_lock(&dbs_info->cdbs.timer_mutex); @@ -345,8 +345,7 @@ static void update_sampling_rate(unsigned int new_rate) cancel_delayed_work_sync(&dbs_info->cdbs.work); mutex_lock(&dbs_info->cdbs.timer_mutex); - schedule_delayed_work_on(dbs_info->cdbs.cpu, - &dbs_info->cdbs.work, + schedule_delayed_work_on(cpu, &dbs_info->cdbs.work, usecs_to_jiffies(new_rate)); }