|
|
@@ -73,6 +73,7 @@ static struct fpga_manager *of_fpga_region_get_mgr(struct device_node *np)
|
|
|
mgr_node = of_parse_phandle(np, "fpga-mgr", 0);
|
|
|
if (mgr_node) {
|
|
|
mgr = of_fpga_mgr_get(mgr_node);
|
|
|
+ of_node_put(mgr_node);
|
|
|
of_node_put(np);
|
|
|
return mgr;
|
|
|
}
|
|
|
@@ -120,10 +121,13 @@ static int of_fpga_region_get_bridges(struct fpga_region *region)
|
|
|
parent_br = region_np->parent;
|
|
|
|
|
|
/* If overlay has a list of bridges, use it. */
|
|
|
- if (of_parse_phandle(info->overlay, "fpga-bridges", 0))
|
|
|
+ br = of_parse_phandle(info->overlay, "fpga-bridges", 0);
|
|
|
+ if (br) {
|
|
|
+ of_node_put(br);
|
|
|
np = info->overlay;
|
|
|
- else
|
|
|
+ } else {
|
|
|
np = region_np;
|
|
|
+ }
|
|
|
|
|
|
for (i = 0; ; i++) {
|
|
|
br = of_parse_phandle(np, "fpga-bridges", i);
|
|
|
@@ -131,12 +135,15 @@ static int of_fpga_region_get_bridges(struct fpga_region *region)
|
|
|
break;
|
|
|
|
|
|
/* If parent bridge is in list, skip it. */
|
|
|
- if (br == parent_br)
|
|
|
+ if (br == parent_br) {
|
|
|
+ of_node_put(br);
|
|
|
continue;
|
|
|
+ }
|
|
|
|
|
|
/* If node is a bridge, get it and add to list */
|
|
|
ret = of_fpga_bridge_get_to_list(br, info,
|
|
|
®ion->bridge_list);
|
|
|
+ of_node_put(br);
|
|
|
|
|
|
/* If any of the bridges are in use, give up */
|
|
|
if (ret == -EBUSY) {
|