diff options
author | Johan Hovold <johan@kernel.org> | 2016-11-24 13:21:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-11-27 20:01:15 -0500 |
commit | fd05d7b18cec1af043990c4b3aabc6780575375c (patch) | |
tree | b7820844a9aac567f12a48550b3cd3639075030b | |
parent | c9bd28233b6d0d82ac3ba0215723be0a8262c39c (diff) |
net: dsa: fix fixed-link-phy device leaks
Make sure to drop the reference taken by of_phy_find_device() when
registering and deregistering the fixed-link PHY-device.
Fixes: 39b0c705195e ("net: dsa: Allow configuration of CPU & DSA port
speeds/duplex")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/dsa/dsa.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index a6902c1e2f28..cb0091b99592 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c | |||
@@ -233,6 +233,8 @@ int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev, | |||
233 | genphy_read_status(phydev); | 233 | genphy_read_status(phydev); |
234 | if (ds->ops->adjust_link) | 234 | if (ds->ops->adjust_link) |
235 | ds->ops->adjust_link(ds, port, phydev); | 235 | ds->ops->adjust_link(ds, port, phydev); |
236 | |||
237 | put_device(&phydev->mdio.dev); | ||
236 | } | 238 | } |
237 | 239 | ||
238 | return 0; | 240 | return 0; |
@@ -509,8 +511,9 @@ void dsa_cpu_dsa_destroy(struct device_node *port_dn) | |||
509 | if (of_phy_is_fixed_link(port_dn)) { | 511 | if (of_phy_is_fixed_link(port_dn)) { |
510 | phydev = of_phy_find_device(port_dn); | 512 | phydev = of_phy_find_device(port_dn); |
511 | if (phydev) { | 513 | if (phydev) { |
512 | phy_device_free(phydev); | ||
513 | fixed_phy_unregister(phydev); | 514 | fixed_phy_unregister(phydev); |
515 | put_device(&phydev->mdio.dev); | ||
516 | phy_device_free(phydev); | ||
514 | } | 517 | } |
515 | } | 518 | } |
516 | } | 519 | } |