aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-19 07:48:30 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-19 07:48:30 -0400
commit9832235f3f880ab2e58141885e3b5ed3b158c0fb (patch)
tree03234656eee774bb7467b2ba15c6877689b324b8 /drivers
parent8f3ba3d3257be80636ed15cc221d6a2efb6a6e82 (diff)
cpufreq: Do not allow ->setpolicy drivers to provide ->target
cpufreq drivers that provide the ->setpolicy() callback are supposed to have integrated governors, so they don't need to set ->target() or ->target_index() and may confuse the core if any of these callbacks is present. For this reason, add a check preventing ->setpolicy cpufreq drivers from registering if they have non-NULL ->target or ->target_index. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/cpufreq.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 2677ff1c0a2c..24cd6ff9bb0b 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2299,7 +2299,9 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
2299 2299
2300 if (!driver_data || !driver_data->verify || !driver_data->init || 2300 if (!driver_data || !driver_data->verify || !driver_data->init ||
2301 !(driver_data->setpolicy || driver_data->target_index || 2301 !(driver_data->setpolicy || driver_data->target_index ||
2302 driver_data->target)) 2302 driver_data->target) ||
2303 (driver_data->setpolicy && (driver_data->target_index ||
2304 driver_data->target)))
2303 return -EINVAL; 2305 return -EINVAL;
2304 2306
2305 pr_debug("trying to register driver %s\n", driver_data->name); 2307 pr_debug("trying to register driver %s\n", driver_data->name);