Commit 5eb73c83 authored by Yangtao Li's avatar Yangtao Li Committed by Daniel Lezcano

clocksource/drivers/integrator-ap: Add missing of_node_put()

The function of_find_node_by_path() acquires a reference to the node
returned by it and that reference needs to be dropped by its caller.

integrator_ap_timer_init_of() doesn't do that.  The pri_node and the
sec_node are used as an identifier to compare against the current
node, so we can directly drop the refcount after getting the node from
the path as it is not used as pointer.

By dropping the refcount right after getting it, a single variable is
needed instead of two.

Fix this by use a single variable and drop the refcount right after
of_find_node_by_path().
Signed-off-by: default avatarYangtao Li <tiny.windzz@gmail.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 64db8bb1
...@@ -181,8 +181,7 @@ static int __init integrator_ap_timer_init_of(struct device_node *node) ...@@ -181,8 +181,7 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
int irq; int irq;
struct clk *clk; struct clk *clk;
unsigned long rate; unsigned long rate;
struct device_node *pri_node; struct device_node *alias_node;
struct device_node *sec_node;
base = of_io_request_and_map(node, 0, "integrator-timer"); base = of_io_request_and_map(node, 0, "integrator-timer");
if (IS_ERR(base)) if (IS_ERR(base))
...@@ -204,7 +203,18 @@ static int __init integrator_ap_timer_init_of(struct device_node *node) ...@@ -204,7 +203,18 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
return err; return err;
} }
pri_node = of_find_node_by_path(path); alias_node = of_find_node_by_path(path);
/*
* The pointer is used as an identifier not as a pointer, we
* can drop the refcount on the of__node immediately after
* getting it.
*/
of_node_put(alias_node);
if (node == alias_node)
/* The primary timer lacks IRQ, use as clocksource */
return integrator_clocksource_init(rate, base);
err = of_property_read_string(of_aliases, err = of_property_read_string(of_aliases,
"arm,timer-secondary", &path); "arm,timer-secondary", &path);
...@@ -213,14 +223,11 @@ static int __init integrator_ap_timer_init_of(struct device_node *node) ...@@ -213,14 +223,11 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
return err; return err;
} }
alias_node = of_find_node_by_path(path);
sec_node = of_find_node_by_path(path); of_node_put(alias_node);
if (node == pri_node)
/* The primary timer lacks IRQ, use as clocksource */
return integrator_clocksource_init(rate, base);
if (node == sec_node) { if (node == alias_node) {
/* The secondary timer will drive the clock event */ /* The secondary timer will drive the clock event */
irq = irq_of_parse_and_map(node, 0); irq = irq_of_parse_and_map(node, 0);
return integrator_clockevent_init(rate, base, irq); return integrator_clockevent_init(rate, base, irq);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment