Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / net / dsa / dsa2.c

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 2a339fb09f4ecb5faf281ffb40a26a9f7a1cfe17..f5270114dcb8c36db002ed9becc2b7aefc73d8e8 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -1359,12 +1359,15 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds,
 
        for_each_available_child_of_node(ports, port) {
                err = of_property_read_u32(port, "reg", &reg);
-               if (err)
+               if (err) {
+                       of_node_put(port);
                        goto out_put_node;
+               }
 
                if (reg >= ds->num_ports) {
                        dev_err(ds->dev, "port %pOF index %u exceeds num_ports (%zu)\n",
                                port, reg, ds->num_ports);
+                       of_node_put(port);
                        err = -EINVAL;
                        goto out_put_node;
                }
@@ -1372,8 +1375,10 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds,
                dp = dsa_to_port(ds, reg);
 
                err = dsa_port_parse_of(dp, port);
-               if (err)
+               if (err) {
+                       of_node_put(port);
                        goto out_put_node;
+               }
        }
 
 out_put_node: