fpga: region: release of_parse_phandle nodes after use

Both fpga_region_get_manager() and fpga_region_get_bridges() call
of_parse_phandle(), but nothing calls of_node_put() on the returned
struct device_node pointers.  Make sure to do that to stop their
reference counters getting out of whack.

Fixes: 0fa20cdfcc1f ("fpga: fpga-region: device tree control for FPGA")
Cc: <stable@vger.kernel.org> # 4.10+
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Alan Tull <atull@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c
index c6b21194dcbcf8b132c27881e2a36e53bbb90046..119ff75522f13d10f10cf6595d5006e7d41bf0b3 100644 (file)
--- a/drivers/fpga/of-fpga-region.c
+++ b/drivers/fpga/of-fpga-region.c
@@ -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,
                                                 &region->bridge_list);
+               of_node_put(br);
 
                /* If any of the bridges are in use, give up */
                if (ret == -EBUSY) {