aboutsummaryrefslogtreecommitdiff
path: root/drivers/cpufreq/cpufreq.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-06-03 00:01:45 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-06-03 00:01:45 +0200
commitbb5710e72c217e5bbdf0969a2fd84f5f5ad7fc2b (patch)
tree4a2d92c0352e1c8e86a8b538e9495b7bdfda9a5d /drivers/cpufreq/cpufreq.c
parent5ed02dbb497422bf225783f46e6eadd237d23d6b (diff)
parent7575f8257279f9dd24b3fc950aa2c7e98564a103 (diff)
downloadleg-kernel-bb5710e72c217e5bbdf0969a2fd84f5f5ad7fc2b.tar.gz
Merge branch 'pm-cpufreq'
* pm-cpufreq: cpufreq: kirkwood-cpufreq:- Handle return value of clk_prepare_enable() cpufreq: cpufreq_register_driver() should return -ENODEV if init fails
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
-rw-r--r--drivers/cpufreq/cpufreq.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 0e3f6496524d..26b643d57847 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2468,6 +2468,7 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
if (!(cpufreq_driver->flags & CPUFREQ_STICKY) &&
list_empty(&cpufreq_policy_list)) {
/* if all ->init() calls failed, unregister */
+ ret = -ENODEV;
pr_debug("%s: No CPU initialized for driver %s\n", __func__,
driver_data->name);
goto err_if_unreg;