From: Johan Hovold <johan@kernel•org>
To: "David S. Miller" <davem@davemloft•net>
Cc: Vince Bridgers <vbridger@opensource•altera.com>,
Florian Fainelli <f.fainelli@gmail•com>,
Fugang Duan <fugang.duan@nxp•com>,
Pantelis Antoniou <pantelis.antoniou@gmail•com>,
Vitaly Bordug <vbordug@ru•mvista.com>,
Claudiu Manoil <claudiu.manoil@freescale•com>,
Li Yang <leoli@freescale•com>,
Thomas Petazzoni <thomas.petazzoni@free-electrons•com>,
Felix Fietkau <nbd@openwrt•org>,
John Crispin <blogic@openwrt•org>,
Matthias Brugger <matthias.bgg@gmail•com>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded•com>,
Lars Persson <lars.persson@axis•com>,
Mugunthan V N <mugunthanvnm@ti•com>,
Grygorii Strashko <grygorii.strashko@ti•com>,
Rob Herring <robh+dt@kernel•org>,
Frank Rowand <frowand.list@gmail•com>,
Andrew Lunn <andrew@lunn•ch>,
Vivien Didelot <vivien.didelot@savoirfairelinux•com>,
netdev@vger•kernel.org, nios2-dev@lists•rocketboards.org,
linux-kernel@vger•kernel.org, linuxppc-dev@lists•ozlabs.org,
linux-mediatek@lists•infradead.org,
linux-renesas-soc@vger•kernel.org, linux-omap@vger•kernel.org,
devicetree@vger•kernel.org, Johan Hovold <johan@kernel•org>
Subject: [PATCH net 13/16] net: ethernet: renesas: ravb: fix fixed-link phydev leaks
Date: Mon, 28 Nov 2016 19:25:06 +0100 [thread overview]
Message-ID: <1480357509-28074-14-git-send-email-johan@kernel.org> (raw)
In-Reply-To: <1480357509-28074-1-git-send-email-johan@kernel.org>
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: b4bc88a868ed ("ravb: Add fixed-link support")
Signed-off-by: Johan Hovold <johan@kernel•org>
---
drivers/net/ethernet/renesas/ravb_main.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 630536bc72f9..f1f3be2cfe21 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -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) {
--
2.7.3
next prev parent reply other threads:[~2016-11-28 18:27 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-28 18:24 [PATCH net 00/16] net: fix fixed-link phydev leaks Johan Hovold
2016-11-28 18:24 ` [PATCH net 01/16] net: dsa: slave: fix of-node leak and phy priority Johan Hovold
2016-11-28 18:24 ` [PATCH net 02/16] of_mdio: add helper to deregister fixed-link PHYs Johan Hovold
2016-11-28 18:24 ` [PATCH net 03/16] net: ethernet: altera: fix fixed-link phydev leaks Johan Hovold
2016-11-28 18:24 ` [PATCH net 04/16] net: ethernet: aurora: nb8800: " Johan Hovold
2016-11-28 18:24 ` [PATCH net 05/16] net: ethernet: bcmsysport: " Johan Hovold
2016-11-28 18:24 ` [PATCH net 06/16] net: ethernet: bcmgenet: " Johan Hovold
2016-11-28 18:25 ` [PATCH net 07/16] net: ethernet: fec: " Johan Hovold
2016-11-28 18:25 ` [PATCH net 08/16] net: ethernet: fs_enet: " Johan Hovold
2016-11-28 18:25 ` [PATCH net 09/16] net: ethernet: gianfar: " Johan Hovold
2016-11-28 18:25 ` [PATCH net 10/16] net: ethernet: ucc_geth: " Johan Hovold
2016-11-28 18:25 ` [PATCH net 11/16] net: ethernet: marvell: mvneta: " Johan Hovold
2016-11-28 20:10 ` Thomas Petazzoni
2020-05-06 18:57 ` Naresh Kamboju
2020-05-07 6:44 ` Johan Hovold
2020-05-07 6:47 ` Greg Kroah-Hartman
2020-05-07 11:13 ` Greg Kroah-Hartman
2020-05-07 22:05 ` Naresh Kamboju
2020-05-08 6:21 ` Johan Hovold
2020-05-08 12:02 ` Greg Kroah-Hartman
2016-11-28 18:25 ` [PATCH net 12/16] net: ethernet: mediatek: " Johan Hovold
2016-11-28 18:25 ` Johan Hovold [this message]
2016-11-28 18:25 ` [PATCH net 14/16] net: ethernet: dwc_eth_qos: " Johan Hovold
2016-11-28 18:25 ` [PATCH net 15/16] net: ethernet: ti: davinci_emac: fix fixed-link phydev and of-node leaks Johan Hovold
2016-11-28 18:25 ` [PATCH net 16/16] net: dsa: slave: fix fixed-link phydev leaks Johan Hovold
2016-11-30 4:17 ` [PATCH net 00/16] net: " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1480357509-28074-14-git-send-email-johan@kernel.org \
--to=johan@kernel$(echo .)org \
--cc=andrew@lunn$(echo .)ch \
--cc=blogic@openwrt$(echo .)org \
--cc=claudiu.manoil@freescale$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=f.fainelli@gmail$(echo .)com \
--cc=frowand.list@gmail$(echo .)com \
--cc=fugang.duan@nxp$(echo .)com \
--cc=grygorii.strashko@ti$(echo .)com \
--cc=lars.persson@axis$(echo .)com \
--cc=leoli@freescale$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mediatek@lists$(echo .)infradead.org \
--cc=linux-omap@vger$(echo .)kernel.org \
--cc=linux-renesas-soc@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=matthias.bgg@gmail$(echo .)com \
--cc=mugunthanvnm@ti$(echo .)com \
--cc=nbd@openwrt$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nios2-dev@lists$(echo .)rocketboards.org \
--cc=pantelis.antoniou@gmail$(echo .)com \
--cc=robh+dt@kernel$(echo .)org \
--cc=sergei.shtylyov@cogentembedded$(echo .)com \
--cc=thomas.petazzoni@free-electrons$(echo .)com \
--cc=vbordug@ru$(echo .)mvista.com \
--cc=vbridger@opensource$(echo .)altera.com \
--cc=vivien.didelot@savoirfairelinux$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox