Merge tag 'fsnotify_for_v4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / cpufreq / powernv-cpufreq.c

diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
index bf6519cf64bc2e040b6e004f1771e47e5691c7e0..7e7ad3879c4e0510ee1de789815fec26ad807040 100644 (file)
--- a/drivers/cpufreq/powernv-cpufreq.c
+++ b/drivers/cpufreq/powernv-cpufreq.c
@@ -253,18 +253,18 @@ static int init_powernv_pstates(void)
 
        if (of_property_read_u32(power_mgt, "ibm,pstate-min", &pstate_min)) {
                pr_warn("ibm,pstate-min node not found\n");
-               return -ENODEV;
+               goto out;
        }
 
        if (of_property_read_u32(power_mgt, "ibm,pstate-max", &pstate_max)) {
                pr_warn("ibm,pstate-max node not found\n");
-               return -ENODEV;
+               goto out;
        }
 
        if (of_property_read_u32(power_mgt, "ibm,pstate-nominal",
                                 &pstate_nominal)) {
                pr_warn("ibm,pstate-nominal not found\n");
-               return -ENODEV;
+               goto out;
        }
 
        if (of_property_read_u32(power_mgt, "ibm,pstate-ultra-turbo",
@@ -293,14 +293,14 @@ next:
        pstate_ids = of_get_property(power_mgt, "ibm,pstate-ids", &len_ids);
        if (!pstate_ids) {
                pr_warn("ibm,pstate-ids not found\n");
-               return -ENODEV;
+               goto out;
        }
 
        pstate_freqs = of_get_property(power_mgt, "ibm,pstate-frequencies-mhz",
                                      &len_freqs);
        if (!pstate_freqs) {
                pr_warn("ibm,pstate-frequencies-mhz not found\n");
-               return -ENODEV;
+               goto out;
        }
 
        if (len_ids != len_freqs) {
@@ -311,7 +311,7 @@ next:
        nr_pstates = min(len_ids, len_freqs) / sizeof(u32);
        if (!nr_pstates) {
                pr_warn("No PStates found\n");
-               return -ENODEV;
+               goto out;
        }
 
        powernv_pstate_info.nr_pstates = nr_pstates;
@@ -352,7 +352,12 @@ next:
 
        /* End of list marker entry */
        powernv_freqs[i].frequency = CPUFREQ_TABLE_END;
+
+       of_node_put(power_mgt);
        return 0;
+out:
+       of_node_put(power_mgt);
+       return -ENODEV;
 }
 
 /* Returns the CPU frequency corresponding to the pstate_id. */