Commit b2486d4f authored by Johan Hovold's avatar Johan Hovold Committed by Ben Hutchings

of_mdio: fix node leak in of_phy_register_fixed_link error path

commit 48c1699d upstream.

Make sure to drop the of_node reference also on failure to parse the
speed property in of_phy_register_fixed_link().

Fixes: 3be2a49e ("of: provide a binding for fixed link PHYs")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent dddd478f
...@@ -291,8 +291,11 @@ int of_phy_register_fixed_link(struct device_node *np) ...@@ -291,8 +291,11 @@ int of_phy_register_fixed_link(struct device_node *np)
status.link = 1; status.link = 1;
status.duplex = of_property_read_bool(fixed_link_node, status.duplex = of_property_read_bool(fixed_link_node,
"full-duplex"); "full-duplex");
if (of_property_read_u32(fixed_link_node, "speed", &status.speed)) if (of_property_read_u32(fixed_link_node, "speed",
&status.speed)) {
of_node_put(fixed_link_node);
return -EINVAL; return -EINVAL;
}
status.pause = of_property_read_bool(fixed_link_node, "pause"); status.pause = of_property_read_bool(fixed_link_node, "pause");
status.asym_pause = of_property_read_bool(fixed_link_node, status.asym_pause = of_property_read_bool(fixed_link_node,
"asym-pause"); "asym-pause");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment