Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f70eb33 authored by Johan Hovold's avatar Johan Hovold Committed by David S. Miller
Browse files

net: ethernet: renesas: ravb: fix fixed-link phydev leaks 



Make sure to deregister and free any fixed-link PHY registered using
of_phy_register_fixed_link() on initialisation errors and on device
close after having disconnected the PHY.

Fixes: b4bc88a8 ("ravb: Add fixed-link support")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 16a67eb3

drivers/net/ethernet/renesas/ravb_main.c

+14 −3
Original line number Diff line number Diff line
@@ -1008,7 +1008,8 @@ static int ravb_phy_init(struct net_device *ndev) 
	of_node_put(pn);

	if (!phydev) {

		netdev_err(ndev, "failed to connect PHY\n");

		return -ENOENT;

		err = -ENOENT;

		goto err_deregister_fixed_link;

	}



	/* This driver only support 10/100Mbit speeds on Gen3
@@ -1020,8 +1021,7 @@ static int ravb_phy_init(struct net_device *ndev) 
		err = phy_set_max_speed(phydev, SPEED_100);

		if (err) {

			netdev_err(ndev, "failed to limit PHY to 100Mbit/s\n");

			phy_disconnect(phydev);

			return err;

			goto err_phy_disconnect;

		}



		netdev_info(ndev, "limited PHY to 100Mbit/s\n");
@@ -1033,6 +1033,14 @@ static int ravb_phy_init(struct net_device *ndev) 
	phy_attached_info(phydev);



	return 0;



err_phy_disconnect:

	phy_disconnect(phydev);

err_deregister_fixed_link:

	if (of_phy_is_fixed_link(np))

		of_phy_deregister_fixed_link(np);



	return err;

}



/* PHY control start function */
@@ -1634,6 +1642,7 @@ static void ravb_set_rx_mode(struct net_device *ndev) 
/* Device close function for Ethernet AVB */

static int ravb_close(struct net_device *ndev)

{

	struct device_node *np = ndev->dev.parent->of_node;

	struct ravb_private *priv = netdev_priv(ndev);

	struct ravb_tstamp_skb *ts_skb, *ts_skb2;
@@ -1663,6 +1672,8 @@ static int ravb_close(struct net_device *ndev) 
	if (ndev->phydev) {

		phy_stop(ndev->phydev);

		phy_disconnect(ndev->phydev);

		if (of_phy_is_fixed_link(np))

			of_phy_deregister_fixed_link(np);

	}



	if (priv->chip_id != RCAR_GEN2) {