8 files changed, 38 insertions, 18 deletions

diff --git a/drivers/cpufreq/armada-37xx-cpufreq.c b/drivers/cpufreq/armada-37xx-cpufreq.c
index 75491fc841a6..0df16eb1eb3c 100644
--- a/drivers/cpufreq/armada-37xx-cpufreq.c
+++ b/drivers/cpufreq/armada-37xx-cpufreq.c
@@ -359,11 +359,11 @@ static int __init armada37xx_cpufreq_driver_init(void)
         struct armada_37xx_dvfs *dvfs;
         struct platform_device *pdev;
         unsigned long freq;
-        unsigned int cur_frequency;
+        unsigned int cur_frequency, base_frequency;
         struct regmap *nb_pm_base, *avs_base;
         struct device *cpu_dev;
         int load_lvl, ret;
-        struct clk *clk;
+        struct clk *clk, *parent;
 
         nb_pm_base =
                 syscon_regmap_lookup_by_compatible("marvell,armada-3700-nb-pm");
@@ -399,6 +399,22 @@ static int __init armada37xx_cpufreq_driver_init(void)
                 return PTR_ERR(clk);
         }
 
+        parent = clk_get_parent(clk);
+        if (IS_ERR(parent)) {
+                dev_err(cpu_dev, "Cannot get parent clock for CPU0\n");
+                clk_put(clk);
+                return PTR_ERR(parent);
+        }
+
+        /* Get parent CPU frequency */
+        base_frequency =  clk_get_rate(parent);
+
+        if (!base_frequency) {
+                dev_err(cpu_dev, "Failed to get parent clock rate for CPU\n");
+                clk_put(clk);
+                return -EINVAL;
+        }
+
         /* Get nominal (current) CPU frequency */
         cur_frequency = clk_get_rate(clk);
         if (!cur_frequency) {
@@ -431,7 +447,7 @@ static int __init armada37xx_cpufreq_driver_init(void)
         for (load_lvl = ARMADA_37XX_DVFS_LOAD_0; load_lvl < LOAD_LEVEL_NR;
              load_lvl++) {
                 unsigned long u_volt = avs_map[dvfs->avs[load_lvl]] * 1000;
-                freq = cur_frequency / dvfs->divider[load_lvl];
+                freq = base_frequency / dvfs->divider[load_lvl];
                 ret = dev_pm_opp_add(cpu_dev, freq, u_volt);
                 if (ret)
                         goto remove_opp;
diff --git a/drivers/cpufreq/armada-8k-cpufreq.c b/drivers/cpufreq/armada-8k-cpufreq.c
index b3f4bd647e9b..988ebc326bdb 100644
--- a/drivers/cpufreq/armada-8k-cpufreq.c
+++ b/drivers/cpufreq/armada-8k-cpufreq.c
@@ -132,6 +132,7 @@ static int __init armada_8k_cpufreq_init(void)
                 of_node_put(node);
                 return -ENODEV;
         }
+        of_node_put(node);
 
         nb_cpus = num_possible_cpus();
         freq_tables = kcalloc(nb_cpus, sizeof(*freq_tables), GFP_KERNEL);
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index a4ff09f91c8f..3e17560b1efe 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -388,11 +388,11 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
                 ret = imx6ul_opp_check_speed_grading(cpu_dev);
                 if (ret) {
                         if (ret == -EPROBE_DEFER)
-                                return ret;
+                                goto put_node;
 
                         dev_err(cpu_dev, "failed to read ocotp: %d\n",
                                 ret);
-                        return ret;
+                        goto put_node;
                 }
         } else {
                 imx6q_opp_check_speed_grading(cpu_dev);
diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
index c2dd43f3f5d8..8d63a6dc8383 100644
--- a/drivers/cpufreq/kirkwood-cpufreq.c
+++ b/drivers/cpufreq/kirkwood-cpufreq.c
@@ -124,13 +124,14 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
         priv.cpu_clk = of_clk_get_by_name(np, "cpu_clk");
         if (IS_ERR(priv.cpu_clk)) {
                 dev_err(priv.dev, "Unable to get cpuclk\n");
-                return PTR_ERR(priv.cpu_clk);
+                err = PTR_ERR(priv.cpu_clk);
+                goto out_node;
         }
 
         err = clk_prepare_enable(priv.cpu_clk);
         if (err) {
                 dev_err(priv.dev, "Unable to prepare cpuclk\n");
-                return err;
+                goto out_node;
         }
 
         kirkwood_freq_table[0].frequency = clk_get_rate(priv.cpu_clk) / 1000;
@@ -161,20 +162,22 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
                 goto out_ddr;
         }
 
-        of_node_put(np);
-        np = NULL;
-
         err = cpufreq_register_driver(&kirkwood_cpufreq_driver);
-        if (!err)
-                return 0;
+        if (err) {
+                dev_err(priv.dev, "Failed to register cpufreq driver\n");
+                goto out_powersave;
+        }
 
-        dev_err(priv.dev, "Failed to register cpufreq driver\n");
+        of_node_put(np);
+        return 0;
 
+out_powersave:
         clk_disable_unprepare(priv.powersave_clk);
 out_ddr:
         clk_disable_unprepare(priv.ddr_clk);
 out_cpu:
         clk_disable_unprepare(priv.cpu_clk);
+out_node:
         of_node_put(np);
 
         return err;
diff --git a/drivers/cpufreq/maple-cpufreq.c b/drivers/cpufreq/maple-cpufreq.c
index d9df89392b84..a94355723ef8 100644
--- a/drivers/cpufreq/maple-cpufreq.c
+++ b/drivers/cpufreq/maple-cpufreq.c
@@ -210,7 +210,7 @@ static int __init maple_cpufreq_init(void)
          */
         valp = of_get_property(cpunode, "clock-frequency", NULL);
         if (!valp)
-                return -ENODEV;
+                goto bail_noprops;
         max_freq = (*valp)/1000;
         maple_cpu_freqs[0].frequency = max_freq;
         maple_cpu_freqs[1].frequency = max_freq/2;
@@ -231,10 +231,6 @@ static int __init maple_cpufreq_init(void)
 
         rc = cpufreq_register_driver(&maple_cpufreq_driver);
 
-        of_node_put(cpunode);
-
-        return rc;
-
 bail_noprops:
         of_node_put(cpunode);
 
diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c
index 75dfbd2a58ea..c7710c149de8 100644
--- a/drivers/cpufreq/pasemi-cpufreq.c
+++ b/drivers/cpufreq/pasemi-cpufreq.c
@@ -146,6 +146,7 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
 
         cpu = of_get_cpu_node(policy->cpu, NULL);
 
+        of_node_put(cpu);
         if (!cpu)
                 goto out;
 
diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c
index 52f0d91d30c1..9b4ce2eb8222 100644
--- a/drivers/cpufreq/pmac32-cpufreq.c
+++ b/drivers/cpufreq/pmac32-cpufreq.c
@@ -552,6 +552,7 @@ static int pmac_cpufreq_init_7447A(struct device_node *cpunode)
         volt_gpio_np = of_find_node_by_name(NULL, "cpu-vcore-select");
         if (volt_gpio_np)
                 voltage_gpio = read_gpio(volt_gpio_np);
+        of_node_put(volt_gpio_np);
         if (!voltage_gpio){
                 pr_err("missing cpu-vcore-select gpio\n");
                 return 1;
@@ -588,6 +589,7 @@ static int pmac_cpufreq_init_750FX(struct device_node *cpunode)
         if (volt_gpio_np)
                 voltage_gpio = read_gpio(volt_gpio_np);
 
+        of_node_put(volt_gpio_np);
         pvr = mfspr(SPRN_PVR);
         has_cpu_l2lve = !((pvr & 0xf00) == 0x100);
 
diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c
index 41a0f0be3f9f..8414c3a4ea08 100644
--- a/drivers/cpufreq/ppc_cbe_cpufreq.c
+++ b/drivers/cpufreq/ppc_cbe_cpufreq.c
@@ -86,6 +86,7 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
         if (!cbe_get_cpu_pmd_regs(policy->cpu) ||
             !cbe_get_cpu_mic_tm_regs(policy->cpu)) {
                 pr_info("invalid CBE regs pointers for cpufreq\n");
+                of_node_put(cpu);
                 return -EINVAL;
         }