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

2 files changed, 11 insertions, 6 deletions

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 8c431e0f3627..c00ee464afc7 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -612,8 +612,8 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds,
 {
         struct device_node *ports, *port;
         struct dsa_port *dp;
+        int err = 0;
         u32 reg;
-        int err;
 
         ports = of_get_child_by_name(dn, "ports");
         if (!ports) {
@@ -624,19 +624,23 @@ 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)
-                        return err;
+                        goto out_put_node;
 
-                if (reg >= ds->num_ports)
-                        return -EINVAL;
+                if (reg >= ds->num_ports) {
+                        err = -EINVAL;
+                        goto out_put_node;
+                }
 
                 dp = &ds->ports[reg];
 
                 err = dsa_port_parse_of(dp, port);
                 if (err)
-                        return err;
+                        goto out_put_node;
         }
 
-        return 0;
+out_put_node:
+        of_node_put(ports);
+        return err;
 }
 
 static int dsa_switch_parse_member_of(struct dsa_switch *ds,
diff --git a/net/dsa/port.c b/net/dsa/port.c
index a2dad10646cb..caeef4c99dc0 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -337,6 +337,7 @@ static struct phy_device *dsa_port_get_phy_device(struct dsa_port *dp)
                 return ERR_PTR(-EPROBE_DEFER);
         }
 
+        of_node_put(phy_dn);
         return phydev;
 }