aboutsummaryrefslogtreecommitdiffstats
path: root/net/dsa/dsa2.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/dsa/dsa2.c')
-rw-r--r--net/dsa/dsa2.c16
1 files changed, 10 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,
612{ 612{
613 struct device_node *ports, *port; 613 struct device_node *ports, *port;
614 struct dsa_port *dp; 614 struct dsa_port *dp;
615 int err = 0;
615 u32 reg; 616 u32 reg;
616 int err;
617 617
618 ports = of_get_child_by_name(dn, "ports"); 618 ports = of_get_child_by_name(dn, "ports");
619 if (!ports) { 619 if (!ports) {
@@ -624,19 +624,23 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds,
624 for_each_available_child_of_node(ports, port) { 624 for_each_available_child_of_node(ports, port) {
625 err = of_property_read_u32(port, "reg", &reg); 625 err = of_property_read_u32(port, "reg", &reg);
626 if (err) 626 if (err)
627 return err; 627 goto out_put_node;
628 628
629 if (reg >= ds->num_ports) 629 if (reg >= ds->num_ports) {
630 return -EINVAL; 630 err = -EINVAL;
631 goto out_put_node;
632 }
631 633
632 dp = &ds->ports[reg]; 634 dp = &ds->ports[reg];
633 635
634 err = dsa_port_parse_of(dp, port); 636 err = dsa_port_parse_of(dp, port);
635 if (err) 637 if (err)
636 return err; 638 goto out_put_node;
637 } 639 }
638 640
639 return 0; 641out_put_node:
642 of_node_put(ports);
643 return err;
640} 644}
641 645
642static int dsa_switch_parse_member_of(struct dsa_switch *ds, 646static int dsa_switch_parse_member_of(struct dsa_switch *ds,