projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ib/5.17-cros-ec-keyb' into next
[platform/kernel/linux-starfive.git]
/
net
/
dsa
/
dsa2.c
diff --git
a/net/dsa/dsa2.c
b/net/dsa/dsa2.c
index
dcad310
..
88e2808
100644
(file)
--- a/
net/dsa/dsa2.c
+++ b/
net/dsa/dsa2.c
@@
-1058,7
+1058,7
@@
static int dsa_tree_setup_switches(struct dsa_switch_tree *dst)
static int dsa_tree_setup_master(struct dsa_switch_tree *dst)
{
struct dsa_port *dp;
static int dsa_tree_setup_master(struct dsa_switch_tree *dst)
{
struct dsa_port *dp;
- int err;
+ int err
= 0
;
rtnl_lock();
rtnl_lock();
@@
-1066,13
+1066,13
@@
static int dsa_tree_setup_master(struct dsa_switch_tree *dst)
if (dsa_port_is_cpu(dp)) {
err = dsa_master_setup(dp->master, dp);
if (err)
if (dsa_port_is_cpu(dp)) {
err = dsa_master_setup(dp->master, dp);
if (err)
-
return err
;
+
break
;
}
}
rtnl_unlock();
}
}
rtnl_unlock();
- return
0
;
+ return
err
;
}
static void dsa_tree_teardown_master(struct dsa_switch_tree *dst)
}
static void dsa_tree_teardown_master(struct dsa_switch_tree *dst)
@@
-1261,7
+1261,7
@@
int dsa_tree_change_tag_proto(struct dsa_switch_tree *dst,
info.tag_ops = tag_ops;
err = dsa_tree_notify(dst, DSA_NOTIFIER_TAG_PROTO, &info);
if (err)
info.tag_ops = tag_ops;
err = dsa_tree_notify(dst, DSA_NOTIFIER_TAG_PROTO, &info);
if (err)
-
return er
r;
+
goto out_unwind_tagge
r;
err = dsa_tree_bind_tag_proto(dst, tag_ops);
if (err)
err = dsa_tree_bind_tag_proto(dst, tag_ops);
if (err)
@@
-1436,6
+1436,7
@@
static int dsa_port_parse_of(struct dsa_port *dp, struct device_node *dn)
const char *user_protocol;
master = of_find_net_device_by_node(ethernet);
const char *user_protocol;
master = of_find_net_device_by_node(ethernet);
+ of_node_put(ethernet);
if (!master)
return -EPROBE_DEFER;
if (!master)
return -EPROBE_DEFER;