git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
marvell
/
prestera
/
prestera_main.c
diff --git
a/drivers/net/ethernet/marvell/prestera/prestera_main.c
b/drivers/net/ethernet/marvell/prestera/prestera_main.c
index 3956d6d5df3c7a4505f8effea9fb8b06752c8368..639d3e940a885acf97e9eb5c798ba1c556969edd 100644
(file)
--- a/
drivers/net/ethernet/marvell/prestera/prestera_main.c
+++ b/
drivers/net/ethernet/marvell/prestera/prestera_main.c
@@
-373,6
+373,7
@@
static int prestera_port_sfp_bind(struct prestera_port *port)
if (!sw->np)
return 0;
+ of_node_get(sw->np);
ports = of_find_node_by_name(sw->np, "ports");
for_each_child_of_node(ports, node) {
@@
-422,6
+423,7
@@
static int prestera_port_sfp_bind(struct prestera_port *port)
}
out:
+ of_node_put(node);
of_node_put(ports);
return err;
}