]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
cpufreq: ARM big LITTLE: put DT nodes after using them
authorViresh Kumar <viresh.kumar@linaro.org>
Mon, 15 Apr 2013 07:05:24 +0000 (07:05 +0000)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 21 Apr 2013 22:53:40 +0000 (00:53 +0200)
DT nodes should be put using of_node_put() to balance their usage counts. This
is not done properly in ARM's big LITTLE driver. Fix it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpufreq/arm_big_little_dt.c

index 452ff46f20b7d24fb951fef7748389a86d26c6e1..44be3115375ca968897b16726a3f9192ab0e1695 100644 (file)
 
 static int dt_init_opp_table(struct device *cpu_dev)
 {
-       struct device_node *np = NULL;
+       struct device_node *np, *parent;
        int count = 0, ret;
 
-       for_each_child_of_node(of_find_node_by_path("/cpus"), np) {
+       parent = of_find_node_by_path("/cpus");
+       if (!parent) {
+               pr_err("failed to find OF /cpus\n");
+               return -ENOENT;
+       }
+
+       for_each_child_of_node(parent, np) {
                if (count++ != cpu_dev->id)
                        continue;
-               if (!of_get_property(np, "operating-points", NULL))
-                       return -ENODATA;
-
-               cpu_dev->of_node = np;
-
-               ret = of_init_opp_table(cpu_dev);
-               if (ret)
-                       return ret;
-
-               return 0;
+               if (!of_get_property(np, "operating-points", NULL)) {
+                       ret = -ENODATA;
+               } else {
+                       cpu_dev->of_node = np;
+                       ret = of_init_opp_table(cpu_dev);
+               }
+               of_node_put(np);
+               of_node_put(parent);
+
+               return ret;
        }
 
        return -ENODEV;
@@ -54,15 +60,24 @@ static int dt_init_opp_table(struct device *cpu_dev)
 
 static int dt_get_transition_latency(struct device *cpu_dev)
 {
-       struct device_node *np = NULL;
+       struct device_node *np, *parent;
        u32 transition_latency = CPUFREQ_ETERNAL;
        int count = 0;
 
-       for_each_child_of_node(of_find_node_by_path("/cpus"), np) {
+       parent = of_find_node_by_path("/cpus");
+       if (!parent) {
+               pr_err("failed to find OF /cpus\n");
+               return -ENOENT;
+       }
+
+       for_each_child_of_node(parent, np) {
                if (count++ != cpu_dev->id)
                        continue;
 
                of_property_read_u32(np, "clock-latency", &transition_latency);
+               of_node_put(np);
+               of_node_put(parent);
+
                return 0;
        }