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

2 files changed, 17 insertions, 3 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;
diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
index 1b9bcd76c60e..c2dd43f3f5d8 100644
--- a/drivers/cpufreq/kirkwood-cpufreq.c
+++ b/drivers/cpufreq/kirkwood-cpufreq.c
@@ -127,7 +127,12 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
                 return PTR_ERR(priv.cpu_clk);
         }
 
-        clk_prepare_enable(priv.cpu_clk);
+        err = clk_prepare_enable(priv.cpu_clk);
+        if (err) {
+                dev_err(priv.dev, "Unable to prepare cpuclk\n");
+                return err;
+        }
+
         kirkwood_freq_table[0].frequency = clk_get_rate(priv.cpu_clk) / 1000;
 
         priv.ddr_clk = of_clk_get_by_name(np, "ddrclk");
@@ -137,7 +142,11 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
                 goto out_cpu;
         }
 
-        clk_prepare_enable(priv.ddr_clk);
+        err = clk_prepare_enable(priv.ddr_clk);
+        if (err) {
+                dev_err(priv.dev, "Unable to prepare ddrclk\n");
+                goto out_cpu;
+        }
         kirkwood_freq_table[1].frequency = clk_get_rate(priv.ddr_clk) / 1000;
 
         priv.powersave_clk = of_clk_get_by_name(np, "powersave");
@@ -146,7 +155,11 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
                 err = PTR_ERR(priv.powersave_clk);
                 goto out_ddr;
         }
-        clk_prepare_enable(priv.powersave_clk);
+        err = clk_prepare_enable(priv.powersave_clk);
+        if (err) {
+                dev_err(priv.dev, "Unable to prepare powersave clk\n");
+                goto out_ddr;
+        }
 
         of_node_put(np);
         np = NULL;