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 <
Subject: [PATCH net 04/16] net: ethernet: aurora: nb8800: fix fixed-link phydev leaks
Date: Mon, 28 Nov 2016 19:24:57 +0100 [thread overview]
Message-ID: <1480357509-28074-5-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 probe errors and on driver unbind.
Fixes: c7dfe3abf40e ("net: ethernet: nb8800: support fixed-link DT
node")
Signed-off-by: Johan Hovold <johan@kernel•org>
---
drivers/net/ethernet/aurora/nb8800.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c
index 00c38bf151e6..e078d8da978c 100644
--- a/drivers/net/ethernet/aurora/nb8800.c
+++ b/drivers/net/ethernet/aurora/nb8800.c
@@ -1466,12 +1466,12 @@ static int nb8800_probe(struct platform_device *pdev)
ret = nb8800_hw_init(dev);
if (ret)
- goto err_free_bus;
+ goto err_deregister_fixed_link;
if (ops && ops->init) {
ret = ops->init(dev);
if (ret)
- goto err_free_bus;
+ goto err_deregister_fixed_link;
}
dev->netdev_ops = &nb8800_netdev_ops;
@@ -1504,6 +1504,9 @@ static int nb8800_probe(struct platform_device *pdev)
err_free_dma:
nb8800_dma_free(dev);
+err_deregister_fixed_link:
+ if (of_phy_is_fixed_link(pdev->dev.of_node))
+ of_phy_deregister_fixed_link(pdev->dev.of_node);
err_free_bus:
of_node_put(priv->phy_node);
mdiobus_unregister(bus);
@@ -1521,6 +1524,8 @@ static int nb8800_remove(struct platform_device *pdev)
struct nb8800_priv *priv = netdev_priv(ndev);
unregister_netdev(ndev);
+ if (of_phy_is_fixed_link(pdev->dev.of_node))
+ of_phy_deregister_fixed_link(pdev->dev.of_node);
of_node_put(priv->phy_node);
mdiobus_unregister(priv->mii_bus);
--
2.7.3
next prev parent reply other threads:[~2016-11-28 18:27 UTC|newest]
Thread overview: 28+ 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 02/16] of_mdio: add helper to deregister fixed-link PHYs Johan Hovold
2016-11-28 18:24 ` Johan Hovold [this message]
2016-11-30 9:36 ` [PATCH net 04/16] net: ethernet: aurora: nb8800: fix fixed-link phydev leaks Mason
2016-11-30 9:51 ` Johan Hovold
[not found] ` <1480357509-28074-1-git-send-email-johan-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
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 03/16] net: ethernet: altera: fix fixed-link phydev leaks 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 13/16] net: ethernet: renesas: ravb: " Johan Hovold
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-28 18:25 ` [PATCH net 12/16] net: ethernet: mediatek: " 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-5-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=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=matthias.bgg@gmail$(echo .)com \
--cc=mugunthanvnm@ti$(echo .)com \
--cc=nbd@openwrt$(echo .)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 \
/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